You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by GitBox <gi...@apache.org> on 2017/12/01 23:03:45 UTC
[GitHub] geertjanw closed pull request #311: [NETBEANS-54] Various module reviews
geertjanw closed pull request #311: [NETBEANS-54] Various module reviews
URL: https://github.com/apache/incubator-netbeans/pull/311
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/css.editor/todo b/css.editor/todo
index b72e8caf8..1ca059e31 100644
--- a/css.editor/todo
+++ b/css.editor/todo
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
Css modules list (source http://www.css3.info/modules/)
* Selectors
diff --git a/java.hints/build.xml b/java.hints/build.xml
index be6dfb4b2..d73020e16 100644
--- a/java.hints/build.xml
+++ b/java.hints/build.xml
@@ -20,13 +20,5 @@
-->
<project name="java.hints" default="netbeans" basedir=".">
- <import file="../nbbuild/templates/projectized.xml"/>
-
- <target name="test" depends="pre-test,projectized-common.test">
- </target>
-
- <target name="pre-test">
- <property name="test.unit.excludes.files" location="test-excludes.txt"/>
- </target>
-
+ <import file="../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/java.hints/test-excludes.txt b/java.hints/test-excludes.txt
deleted file mode 100644
index beb5f9e05..000000000
--- a/java.hints/test-excludes.txt
+++ /dev/null
@@ -1 +0,0 @@
-**/JavaHintsProviderTest*
diff --git a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Class.template b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Class.template
index 864746b92..e7172a25c 100644
--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Class.template
+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Class.template
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<#if package?? && package != "">
package ${package};
diff --git a/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java b/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java
index ec8cdd969..35e661650 100644
--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java
+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java
@@ -60,12 +60,6 @@ public ErrorHintsProviderTest(String testName) {
super(testName);
}
-// public static Test suite() {
-// TestSuite suite = new TestSuite(JavaHintsProviderTest.class);
-//
-// return suite;
-// }
-
private FileObject testSource;
private JavaSource js;
private CompilationInfo info;
diff --git a/java.navigation/test/log.txt b/java.navigation/test/log.txt
deleted file mode 100644
index c3f893856..000000000
--- a/java.navigation/test/log.txt
+++ /dev/null
@@ -1 +0,0 @@
-ant -verbose -Dnetbeans.dest.dir=/home/pzajac/builds/netbeans -Dxtest.testtype=qa-functional -Dxtest.attribs=validation
diff --git a/java.source/build.xml b/java.source/build.xml
index 262ea1328..b2c518f73 100644
--- a/java.source/build.xml
+++ b/java.source/build.xml
@@ -22,13 +22,5 @@
<project basedir="." default="netbeans" name="java.source">
<import file="../nbbuild/templates/projectized.xml"/>
<property name="nb.modules.dir" value="modules"/>
-
- <target name="test" depends="pre-test,projectized-common.test">
- </target>
-
- <target name="pre-test">
- <property name="test.unit.excludes.files" location="test-excludes.txt"/>
- </target>
-
</project>
diff --git a/java.source/test-excludes.txt b/java.source/test-excludes.txt
deleted file mode 100644
index c5f1fdb99..000000000
--- a/java.source/test-excludes.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-**/CachingFileManagerTest*
-**/CachingZipArchiveTest*
-**/BasicPerformanceTest*
-**/CachingFolderArchiveTest*
-**/GeneratorTest*
-**/FileManagerTest*
-**/PerfJavacIntefaceGCTest*
-**/PerfResolveTest*
-**/PerfBatchCompilationTest*
-**/AnnotationOnLocVarTest*
-**/ClashingImportsTest*
-**/ImportFormatTest*
-**/LabelsTest*
-**/MemberAdditionTest*
-**/MethodBodyTextTest*
-**/UiUtilsTest*
-**/RepositoryUpdaterTest*
-**/ClassIndexTest*
\ No newline at end of file
diff --git a/jshell.support/src/org/netbeans/modules/jshell/resources/ShellClass.java.template b/jshell.support/src/org/netbeans/modules/jshell/resources/ShellClass.java.template
index 9a193f2d3..06883b35e 100644
--- a/jshell.support/src/org/netbeans/modules/jshell/resources/ShellClass.java.template
+++ b/jshell.support/src/org/netbeans/modules/jshell/resources/ShellClass.java.template
@@ -1,3 +1,23 @@
+<#--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<#assign licenseFirst = "/*">
<#assign licensePrefix = " * ">
<#assign licenseLast = " */">
diff --git a/lib.profiler/test/qa-functional/coverage.txt b/lib.profiler/test/qa-functional/coverage.txt
index 4979f1e44..6ea59405d 100644
--- a/lib.profiler/test/qa-functional/coverage.txt
+++ b/lib.profiler/test/qa-functional/coverage.txt
@@ -1,3 +1,6 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
What functionality the functional tests cover.
Test of calibration
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 120e4c74e..4e65b5c14 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2051,7 +2051,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="**/nbproject/jfx-impl.xml" /> <!--generated, no degree of creativity -->
<exclude name="**/nbproject/private/**" /> <!--user-specific files -->
<exclude name="**/src/META-INF/**" /> <!--no degree of creativity-->
- <exclude name="*/build/**" />
+ <exclude name="**/build/**" /> <!-- build artifacts -->
<exclude name="**/.dep.inc" /> <!--no degree of creativity-->
<exclude name="**/Makefile-vc" /> <!--no degree of creativity-->
<exclude name="**/Makefile-vc-wo-crt" /> <!--no degree of creativity-->
@@ -2067,7 +2067,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE-->
<exclude name="css.editor/src/org/netbeans/modules/css/resources/CascadeStyleSheet.css.template" /> <!-- user visible template -->
<exclude name="css.editor/src/org/netbeans/modules/css/resources/CssExample" /> <!-- user visible template -->
- <exclude name="css.editor/todo" /> <!-- no degree of creativity -->
<exclude name="debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JspLineBreakpointApp.txt" /> <!-- test data -->
<exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data-->
<exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data-->
@@ -2102,15 +2101,18 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/resources/module-info.java.template" /> <!--template file-->
<exclude name="java.platform.ui/src/org/netbeans/modules/java/platform/resources/templates/javaplatform.xml" /> <!--template file-->
<exclude name="java.project.ui/src/org/netbeans/modules/java/project/ui/resources/*.template" /> <!-- template files -->
- <exclude name="java.source/test-excludes.txt" /> <!-- test context -->
<exclude name="java.source/src/org/netbeans/modules/**/*.template" /> <!-- template files -->
<exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE-->
- <exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files -->
<exclude name="jellytools.platform/src/org/netbeans/jellytools/version_info" /> <!--does not natively support comments-->
+ <exclude name="jshell.support/src/org/netbeans/modules/jshell/resources/consoleExample.jsh" /> <!-- file is used as sample for syntax highlighting in GUI -->
+ <exclude name="jshell.support/test/unit/src/org/netbeans/modules/jshell/support/*.txt" /> <!--test data-->
<exclude name="junit.ui/src/org/netbeans/modules/junit/ui/resources/*.template" /> <!--license would be visible when users edit the templates inside their IDE-->
<exclude name="languages.diff/src/org/netbeans/modules/languages/diff/DiffExample.diff" /> <!--license would be visible to users in the Fonts/Colors settings-->
<exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yaml" /> <!--Files used in GUI as sample/starting point-->
<exclude name="languages.yaml/src/org/netbeans/modules/languages/yaml/*.yml" /> <!--Files used in GUI as sample/starting point-->
+ <exclude name="lexer/demo/src/org/netbeans/modules/lexer/demo/**/*.txt" /> <!-- test data -->
+ <exclude name="lib.profiler/test/unit/src/org/netbeans/lib/profiler/heap/testHeapDumpLog.txt" /> <!--test data-->
+ <exclude name="lib.profiler/release/lib/deployed/**/*.map" /> <!-- companion files for CDDL licensed binaries -->
<exclude name="lib.uihandler/src/org/netbeans/lib/uihandler/pubKey" /> <!--no degree of creativity-->
<exclude name="lib.uihandler/test/unit/src/**" /> <!--test data-->
<exclude name="maven.htmlui/src/org/netbeans/modules/maven/htmlui/UIDefaults" /> <!-- config file with no place for license header-->
@@ -2129,8 +2131,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template -->
<exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template -->
<exclude name="o.n.bootstrap/readme/*.txt" /> <!--READMEs-->
- <exclude name="o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt" /> <!--no degree of creativity-->
- <exclude name="o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt" /> <!--no degree of creativity-->
<exclude name="o.n.core/licenses/**" /> <!-- license files -->
<exclude name="o.n.core/test/unit/src/org/netbeans/core/modules/jars/localized-manifest/locmani/something.txt" /> <!--no degree of creativity-->
<exclude name="o.n.core/test/unit/src/org/netbeans/core/projects/cache/data/**" /> <!-- test data -->
@@ -2142,9 +2142,9 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="openide.util.lookup/test/unit/src/org/openide/util/lookup/services-jar-2.txt" /> <!--no degree of creativity-->
<exclude name="openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateEmpty.txt" /> <!-- license would cause tests to fail -->
<exclude name="openide.util/test/unit/src/org/openide/util/LookupUsesRequestProcessorTest.resource" /> <!-- license would cause tests to fail -->
- <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya-->
- <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya-->
- <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya-->
+ <exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativity-->
+ <exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativity-->
+ <exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativity-->
<exclude name="projectui/src/org/netbeans/modules/project/ui/resources/*-license.txt" /> <!--licenses-->
<exclude name="projectui/src/org/netbeans/modules/project/ui/resources/license-default.txt" /> <!--licenses-->
<exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data-->
diff --git a/o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt b/o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt
index 651c9de60..6b1b1ed1e 100644
--- a/o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt
+++ b/o.n.bootstrap/test/unit/src/org/fakepkg/resource1.txt
@@ -1 +1,4 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
first dummy resource
diff --git a/o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt b/o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt
index 295fb5d88..6cca230b7 100644
--- a/o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt
+++ b/o.n.bootstrap/test/unit/src/org/fakepkg/resource2.txt
@@ -1 +1,4 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements; and to You under the Apache License, Version 2.0.
+
second dummy resource
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services