junichi11 closed pull request #367: [NETBEANS-281] Add ASF license template
URL: https://github.com/apache/incubator-netbeans/pull/367
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java
b/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java
index 26c856fb1..1e18549a2 100644
---
a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java
+++
b/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java
@@ -63,7 +63,7 @@ public TemplateAttributesProvider(NbModuleProject p,
AntProjectHelper helper, bo
String licensePath = props.getProperty("project.licensePath"); //
NOI18N
if (license == null && netbeansOrg) {
- license = "apache20-netbeans"; // NOI18N
+ license = "apache20-asf"; // NOI18N
}
if (license == null && licensePath == null && project != null) {
SuiteProject sp;
diff --git
a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
b/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
index 457ff40ea..2b0ad2d9c 100644
---
a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
+++
b/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml
@@ -261,11 +261,6 @@
<attr name="displayName"
bundlevalue="org.netbeans.modules.apisupport.project.ui.Bundle#Templates/Licenses/license-cddl-netbeans-sun.txt"/>
<attr name="mavenLicenseURL"
stringvalue="http://www.netbeans.org/cddl-gplv2.html"/>
</file>
- <file name="license-apache20-netbeans.txt"
url="license-apache20-netbeans.txt">
- <attr name="template" boolvalue="true"/>
- <attr name="displayName"
bundlevalue="org.netbeans.modules.apisupport.project.ui.Bundle#Templates/Licenses/license-apache20-netbeans.txt"/>
- <attr name="mavenLicenseURL"
stringvalue="http://www.apache.org/licenses/LICENSE-2.0"/>
- </file>
</folder>
<folder name="Project">
<folder name="APISupport">
diff --git
a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties
b/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties
index 4ceb39a6c..267ae495e 100644
---
a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties
+++
b/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties
@@ -75,7 +75,6 @@ HINT_suite_project_root_node=Module suite project in {0}
LBL_jnlp_master=JNLP Descriptor
Templates/Licenses/license-cddl-netbeans-sun.txt=NetBeans CDDL/GPL
-Templates/Licenses/license-apache20-netbeans.txt=NetBeans Apache License 2.0
TestDataDirsNodeFactory.unit_test_data=Unit Test Data
TestDataDirsNodeFactory.qa-functional_test_data=Functional Test Data
diff --git a/dlight.nativeexecution/nbproject/project.properties
b/dlight.nativeexecution/nbproject/project.properties
index 14f5991fb..345cefdca 100644
--- a/dlight.nativeexecution/nbproject/project.properties
+++ b/dlight.nativeexecution/nbproject/project.properties
@@ -18,7 +18,7 @@ is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
-project.license=apache20-netbeans
+project.license=apache20-asf
nbm.executable.files=bin/nativeexecution/**
jnlp.indirect.files=bin/nativeexecution/**
spec.version.base=1.40.13
diff --git
a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-apache20-netbeans.txt
b/projectui/src/org/netbeans/modules/project/ui/resources/apache20-asf-license.txt
similarity index 100%
rename from
apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-apache20-netbeans.txt
rename to
projectui/src/org/netbeans/modules/project/ui/resources/apache20-asf-license.txt
diff --git a/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml
b/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml
index bf38bc5b2..c94adacd7 100644
--- a/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml
+++ b/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml
@@ -179,6 +179,11 @@
<attr name="template" boolvalue="true"/>
<attr name="mavenLicenseURL"
stringvalue="https://opensource.org/licenses/Apache-2.0
http://opensource.org/licenses/Apache-2.0
http://www.apache.org/licenses/LICENSE-2.0.txt"/>
</file>
+ <file name="license-apache20-asf.txt"
url="apache20-asf-license.txt">
+ <attr name="displayName" stringvalue="ASF - Apache License
2.0"/>
+ <attr name="template" boolvalue="true"/>
+ <attr name="mavenLicenseURL"
stringvalue="https://opensource.org/licenses/Apache-2.0
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"/>
diff --git a/terminal/nbproject/project.properties
b/terminal/nbproject/project.properties
index 10dc85866..bf03c0936 100644
--- a/terminal/nbproject/project.properties
+++ b/terminal/nbproject/project.properties
@@ -30,7 +30,7 @@ javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
nbm.homepage=http://wiki.netbeans.org/TerminalEmulator
is.autoload=true
-project.license=apache20-netbeans
+project.license=apache20-asf
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
