Attachment #146476 for bug #243453

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 243453
Collapse All | Expand All

Lines 200-206 Link Here

(-)a/maven.grammar/src/org/netbeans/modules/maven/codegen/NewLicensePanel.java (-1 / +1 lines)
200	dn = dn.substring("license-".length());	200	dn = dn.substring("license-".length());
201	}	201	}
202	}	202	}
203	Tuple tup = new Tuple(url, dn);	203	Tuple tup = new Tuple(url.replaceFirst(" .+", ""), dn);
204	dlm.addElement(tup);	204	dlm.addElement(tup);
205	}	205	}
206	}	206	}




import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.logging.Level;


    public static String findLicenseByMavenProjectContent(MavenProject mp) {
        // try to match the project's license URL and the mavenLicenseURL attribute of license template
        FileObject licensesFO = FileUtil.getConfigFile("Templates/Licenses"); //NOI18N
        if (licensesFO == null) {
            return null;
        }
        FileObject[] licenseFiles = licensesFO.getChildren();
        for (License license : mp.getLicenses()) {
            String url = license.getUrl();
            if (url != null) {
                for (FileObject fo : licenseFiles) {
                    String str = (String)fo.getAttribute("mavenLicenseURL"); //NOI18N
                    if (str != null && Arrays.asList(str.split(" ")).contains(url)) {
                        if (fo.getName().startsWith("license-")) { // NOI18N
                            return fo.getName().substring("license-".length()); //NOI18N
                        } else {
                            Logger.getLogger(TemplateAttrProvider.class.getName()).log(Level.WARNING, "Bad license file name {0} (expected to start with ''license-'' prefix)", fo.getName());
                        }

                }
            }
        }
        return null;
    }
}




            <file name="license-apache20.txt" url="apache20-license.txt">
                <attr name="displayName" stringvalue="Apache License 2.0"/>
                <attr name="template" boolvalue="true"/>
                <attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0.txt"/>
            </file>
            <file name="license-mit.txt" url="mit-license.txt">
                <attr name="displayName" stringvalue="MIT License"/>
                <attr name="template" boolvalue="true"/>
                <attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/MIT http://www.opensource.org/licenses/mit-license.php"/>
            </file>
            <file name="license-gpl20.txt" url="gpl20-license.txt">
                <attr name="displayName" stringvalue="General Public License 2.0"/>
                <attr name="template" boolvalue="true"/>
                <attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/GPL-2.0 http://www.gnu.org/licenses/gpl-2.0.html"/>
            </file>
            <file name="license-gpl30.txt" url="gpl30-license.txt">
                <attr name="template" boolvalue="true"/>
                <attr name="displayName" stringvalue="General Public License 3.0"/>
                <attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/GPL-3.0 http://www.gnu.org/licenses/gpl-3.0.html"/>
            </file>
            <file name="license-lgpl21.txt" url="lgpl21-license.txt">
                <attr name="displayName" stringvalue="Lesser GPL 2.1"/>
                <attr name="template" boolvalue="true"/>
                <attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/LGPL-2.1 http://www.gnu.org/licenses/lgpl-2.1.html"/>
            </file>
            <file name="license-epl10.txt" url="epl10-license.txt">
                <attr name="displayName" stringvalue="Eclipse Public License 1.0"/>
                <attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/EPL-1.0 http://www.eclipse.org/legal/epl-v10.html"/>
                <attr name="template" boolvalue="true"/>
            </file>            
            <file name="license-bsd.txt" url="bsd-license.txt">
                <attr name="displayName" stringvalue="BSD 2-Clause License"/>
                <attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/BSD-2-Clause http://opensource.org/licenses/bsd-license.php"/>
                <attr name="template" boolvalue="true"/>
            </file>            
            

Lines 975-982 Link Here

(-)a/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java (-2 / +2 lines)
975	"TemplatesPanel_TemplateNode_DisplayName_Desc=Display name of this template. Shown in File\|New wizard as well as in Tools\|Templates.",	975	"TemplatesPanel_TemplateNode_DisplayName_Desc=Display name of this template. Shown in File\|New wizard as well as in Tools\|Templates.",
976	"TemplatesPanel_TemplateNode_FileName=File Name",	976	"TemplatesPanel_TemplateNode_FileName=File Name",
977	"TemplatesPanel_TemplateNode_FileName_Desc=File name of file represented by this template.",	977	"TemplatesPanel_TemplateNode_FileName_Desc=File name of file represented by this template.",
978	"TemplatesPanel_TemplateNode_License=License URL",	978	"TemplatesPanel_TemplateNode_License=License URL(s)",
979	"TemplatesPanel_TemplateNode_License_Desc=Authoritative web location of this license.",	979	"TemplatesPanel_TemplateNode_License_Desc=Authoritative web location of this license (may include several separated by spaces).",
980	"TemplatesPanel_TemplateNode_ScriptEngine=Script Engine",	980	"TemplatesPanel_TemplateNode_ScriptEngine=Script Engine",
981	"TemplatesPanel_TemplateNode_ScriptEngine_Desc=Script engine use for processing this template.",	981	"TemplatesPanel_TemplateNode_ScriptEngine_Desc=Script engine use for processing this template.",
982	"TemplatesPanel_TemplateNode_TemplateCategories=Template Categories",	982	"TemplatesPanel_TemplateNode_TemplateCategories=Template Categories",

Return to bug 243453

Lines 48-54 Link Here

(-)a/maven/src/org/netbeans/modules/maven/TemplateAttrProvider.java (-11 / +12 lines)
48	import java.util.Arrays;	48	import java.util.Arrays;
49	import java.util.Collections;	49	import java.util.Collections;
50	import java.util.HashMap;	50	import java.util.HashMap;
51	import java.util.List;
52	import java.util.Map;	51	import java.util.Map;
53	import java.util.TreeMap;	52	import java.util.TreeMap;
54	import java.util.logging.Level;	53	import java.util.logging.Level;
Lines 188-204 Link Here
188		187
189	public static String findLicenseByMavenProjectContent(MavenProject mp) {	188	public static String findLicenseByMavenProjectContent(MavenProject mp) {
190	// try to match the project's license URL and the mavenLicenseURL attribute of license template	189	// try to match the project's license URL and the mavenLicenseURL attribute of license template
191	String toRet = null;	190	FileObject licensesFO = FileUtil.getConfigFile("Templates/Licenses"); //NOI18N
192	List<License> lst = mp.getLicenses();	191	if (licensesFO == null) {
193	if (!lst.isEmpty()) {	192	return null;
194	String url = lst.get(0).getUrl();	193	}
195	FileObject licenses = FileUtil.getConfigFile("Templates/Licenses"); //NOI18N	194	FileObject[] licenseFiles = licensesFO.getChildren();
196	if (url != null && licenses != null) {	195	for (License license : mp.getLicenses()) {
197	for (FileObject fo : licenses.getChildren()) {	196	String url = license.getUrl();
		197	if (url != null) {
		198	for (FileObject fo : licenseFiles) {
198	String str = (String)fo.getAttribute("mavenLicenseURL"); //NOI18N	199	String str = (String)fo.getAttribute("mavenLicenseURL"); //NOI18N
199	if (str != null && str.equalsIgnoreCase(url)) {	200	if (str != null && Arrays.asList(str.split(" ")).contains(url)) {
200	if (fo.getName().startsWith("license-")) { // NOI18N	201	if (fo.getName().startsWith("license-")) { // NOI18N
201	toRet = fo.getName().substring("license-".length()); //NOI18N	202	return fo.getName().substring("license-".length()); //NOI18N
202	} else {	203	} else {
203	Logger.getLogger(TemplateAttrProvider.class.getName()).log(Level.WARNING, "Bad license file name {0} (expected to start with ''license-'' prefix)", fo.getName());	204	Logger.getLogger(TemplateAttrProvider.class.getName()).log(Level.WARNING, "Bad license file name {0} (expected to start with ''license-'' prefix)", fo.getName());
204	}	205	}
Lines 207-212 Link Here
207	}	208	}
208	}	209	}
209	}	210	}
210	return toRet;	211	return null;
211	}	212	}
212	}	213	}

Lines 201-236 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml (-7 / +7 lines)
201	<file name="license-apache20.txt" url="apache20-license.txt">	201	<file name="license-apache20.txt" url="apache20-license.txt">
202	<attr name="displayName" stringvalue="Apache License 2.0"/>	202	<attr name="displayName" stringvalue="Apache License 2.0"/>
203	<attr name="template" boolvalue="true"/>	203	<attr name="template" boolvalue="true"/>
204	<attr name="mavenLicenseURL" stringvalue="http://www.apache.org/licenses/LICENSE-2.0.txt"/>	204	<attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0.txt"/>
205	</file>	205	</file>
206	<file name="license-mit.txt" url="mit-license.txt">	206	<file name="license-mit.txt" url="mit-license.txt">
207	<attr name="displayName" stringvalue="MIT License"/>	207	<attr name="displayName" stringvalue="MIT License"/>
208	<attr name="template" boolvalue="true"/>	208	<attr name="template" boolvalue="true"/>
209	<attr name="mavenLicenseURL" stringvalue="http://www.opensource.org/licenses/mit-license.php"/>	209	<attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/MIT http://www.opensource.org/licenses/mit-license.php"/>
210	</file>	210	</file>
211	<file name="license-gpl20.txt" url="gpl20-license.txt">	211	<file name="license-gpl20.txt" url="gpl20-license.txt">
212	<attr name="displayName" stringvalue="General Public License 2.0"/>	212	<attr name="displayName" stringvalue="General Public License 2.0"/>
213	<attr name="template" boolvalue="true"/>	213	<attr name="template" boolvalue="true"/>
214	<attr name="mavenLicenseURL" stringvalue="http://www.gnu.org/licenses/gpl-2.0.html"/>	214	<attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/GPL-2.0 http://www.gnu.org/licenses/gpl-2.0.html"/>
215	</file>	215	</file>
216	<file name="license-gpl30.txt" url="gpl30-license.txt">	216	<file name="license-gpl30.txt" url="gpl30-license.txt">
217	<attr name="template" boolvalue="true"/>	217	<attr name="template" boolvalue="true"/>
218	<attr name="displayName" stringvalue="General Public License 3.0"/>	218	<attr name="displayName" stringvalue="General Public License 3.0"/>
219	<attr name="mavenLicenseURL" stringvalue="http://www.gnu.org/licenses/gpl-3.0.html"/>	219	<attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/GPL-3.0 http://www.gnu.org/licenses/gpl-3.0.html"/>
220	</file>	220	</file>
221	<file name="license-lgpl21.txt" url="lgpl21-license.txt">	221	<file name="license-lgpl21.txt" url="lgpl21-license.txt">
222	<attr name="displayName" stringvalue="Lesser GPL 2.1"/>	222	<attr name="displayName" stringvalue="Lesser GPL 2.1"/>
223	<attr name="template" boolvalue="true"/>	223	<attr name="template" boolvalue="true"/>
224	<attr name="mavenLicenseURL" stringvalue="http://www.gnu.org/licenses/lgpl-2.1.html"/>	224	<attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/LGPL-2.1 http://www.gnu.org/licenses/lgpl-2.1.html"/>
225	</file>	225	</file>
226	<file name="license-epl10.txt" url="epl10-license.txt">	226	<file name="license-epl10.txt" url="epl10-license.txt">
227	<attr name="displayName" stringvalue="Eclipse Public License 1.0"/>	227	<attr name="displayName" stringvalue="Eclipse Public License 1.0"/>
228	<attr name="mavenLicenseURL" stringvalue="http://www.eclipse.org/legal/epl-v10.html"/>	228	<attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/EPL-1.0 http://www.eclipse.org/legal/epl-v10.html"/>
229	<attr name="template" boolvalue="true"/>	229	<attr name="template" boolvalue="true"/>
230	</file>	230	</file>
231	<file name="license-bsd.txt" url="bsd-license.txt">	231	<file name="license-bsd.txt" url="bsd-license.txt">
232	<attr name="displayName" stringvalue="BSD 2-Clause License"/>	232	<attr name="displayName" stringvalue="BSD 2-Clause License"/>
233	<attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/bsd-license.php"/>	233	<attr name="mavenLicenseURL" stringvalue="http://opensource.org/licenses/BSD-2-Clause http://opensource.org/licenses/bsd-license.php"/>
234	<attr name="template" boolvalue="true"/>	234	<attr name="template" boolvalue="true"/>
235	</file>	235	</file>
236		236