From 6f7d84fb96fc8e64bf0a0efcca09feeabd6d92d8 Mon Sep 17 00:00:00 2001 From: Antonio Vieiro Date: Tue, 3 Oct 2017 09:14:10 +0200 Subject: [PATCH 1/2] [NETBEANS-54] Module Review editor - No external libraries. - Checked Rat report: added license to project files. Did NOT add license to editor/demosrc/README nor to the rest of test files. - Unit tests org.netbeans.editor.PlainDocumentCompatibilityRandomTest and org.netbeans.modules.editor.NbEditorToolBarTest fail (but they were also failing before this PR). - QA Tests should be run. --- editor/demosrc/base/settings.properties | 50 ++++++------------ editor/src/META-INF/netbeans/translate.names | 52 ++++++------------- .../qa-functional/data/cp-prj-1/build.xml | 20 +++++++ .../cp-prj-1/nbproject/project.properties | 17 ++++++ .../data/cp-prj-1/nbproject/project.xml | 20 +++++++ .../data/projects/editor_test/build.xml | 20 +++++++ .../editor_test/nbproject/project.properties | 17 ++++++ .../editor_test/nbproject/project.xml | 20 +++++++ .../editor/impl/KitsTracker-test-layer.xml | 20 +++++++ .../SideBarFactoriesProvider-test-layer.xml | 20 +++++++ 10 files changed, 185 insertions(+), 71 deletions(-) diff --git a/editor/demosrc/base/settings.properties b/editor/demosrc/base/settings.properties index 3c8fa2a2b39f..4b5860937210 100644 --- a/editor/demosrc/base/settings.properties +++ b/editor/demosrc/base/settings.properties @@ -1,40 +1,20 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# 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 # -# Copyright (c) 2000, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): +# 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. + # File with settings of kits the editor is providing, their recognized file # types, icons, menu labels and so on. # diff --git a/editor/src/META-INF/netbeans/translate.names b/editor/src/META-INF/netbeans/translate.names index 540b579c9401..dea8e736c80d 100644 --- a/editor/src/META-INF/netbeans/translate.names +++ b/editor/src/META-INF/netbeans/translate.names @@ -1,41 +1,21 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# 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 # -# Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved. +# http://www.apache.org/licenses/LICENSE-2.0 # -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. -# -# Contributor(s): +# 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. + # org.oldpackage.MyClass=org.newpackage.MyClass org.netbeans.modules.editor.options.PlainPrintOptions=org.netbeans.modules.editor.plain.options.PlainPrintOptions org.netbeans.modules.editor.options.JavaPrintOptions=org.netbeans.modules.java.editor.options.JavaPrintOptions -org.netbeans.modules.editor.options.HTMLPrintOptions=org.netbeans.modules.html.editor.options.HTMLPrintOptions \ No newline at end of file +org.netbeans.modules.editor.options.HTMLPrintOptions=org.netbeans.modules.html.editor.options.HTMLPrintOptions diff --git a/editor/test/qa-functional/data/cp-prj-1/build.xml b/editor/test/qa-functional/data/cp-prj-1/build.xml index 1f2528558267..d7db0213dacf 100644 --- a/editor/test/qa-functional/data/cp-prj-1/build.xml +++ b/editor/test/qa-functional/data/cp-prj-1/build.xml @@ -1,4 +1,24 @@ + diff --git a/editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties b/editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties index 6df67d73ccdf..5186731739da 100644 --- a/editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties +++ b/editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties @@ -1,3 +1,20 @@ +# 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. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml b/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml index 43c9eeefcf65..733578c32639 100644 --- a/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml +++ b/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml @@ -1,4 +1,24 @@ + org.netbeans.modules.java.j2seproject diff --git a/editor/test/qa-functional/data/projects/editor_test/build.xml b/editor/test/qa-functional/data/projects/editor_test/build.xml index f6bff2d6e492..cc762b0e860f 100644 --- a/editor/test/qa-functional/data/projects/editor_test/build.xml +++ b/editor/test/qa-functional/data/projects/editor_test/build.xml @@ -1,4 +1,24 @@ + diff --git a/editor/test/qa-functional/data/projects/editor_test/nbproject/project.properties b/editor/test/qa-functional/data/projects/editor_test/nbproject/project.properties index c670c69eb77b..fa948345f8b0 100644 --- a/editor/test/qa-functional/data/projects/editor_test/nbproject/project.properties +++ b/editor/test/qa-functional/data/projects/editor_test/nbproject/project.properties @@ -1,3 +1,20 @@ +# 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. + application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form diff --git a/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml b/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml index 16aef3df5725..0f996d234bd0 100644 --- a/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml +++ b/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml @@ -1,4 +1,24 @@ + org.netbeans.modules.java.j2seproject diff --git a/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml b/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml index 4102a4ebdf5e..4197150526e3 100644 --- a/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml +++ b/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml @@ -1,4 +1,24 @@ + diff --git a/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml b/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml index af3743664d2e..4688946df5ca 100644 --- a/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml +++ b/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml @@ -1,4 +1,24 @@ + From 0c97fac8d750359b4b217e1d4747ca6a9bea08f0 Mon Sep 17 00:00:00 2001 From: Antonio Vieiro Date: Thu, 2 Nov 2017 22:37:13 +0100 Subject: [PATCH 2/2] - Added test files to rat exclusion list. - Added license to one README file. --- editor/demosrc/README | 2 ++ nbbuild/build.xml | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/editor/demosrc/README b/editor/demosrc/README index 23c7ca80b8ca..70a9628b7a3d 100644 --- a/editor/demosrc/README +++ b/editor/demosrc/README @@ -1,3 +1,5 @@ +Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + Introduction: This is the implementation of simple standalone editor application. It is based on the fact that NetBeans editors are pure swing editors. diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 12bd9ada1061..237a9ffa10e3 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2002,6 +2002,14 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d + + + + + + + +