Repository: incubator-netbeans Updated Branches: refs/heads/master 7fe8ddf7c -> b136e1207
[NETBEANS-54] Module review xml.multiview - no external library - checked Rat report; added license header to testfiles, manually updated unconverted license headers - skimmed through the module, did not notice additional problems Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c7cc9953 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c7cc9953 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c7cc9953 Branch: refs/heads/master Commit: c7cc9953d6f042dbce1cb8670194547dd3f3226d Parents: c70e37a Author: Matthias Bläsing <[email protected]> Authored: Tue Oct 3 19:17:53 2017 +0200 Committer: Matthias Bläsing <[email protected]> Committed: Wed Oct 11 19:04:15 2017 +0200 ---------------------------------------------------------------------- .../modules/xml/multiview/Bundle.properties | 53 +++++-------------- .../modules/xml/multiview/ui/Bundle.properties | 55 +++++--------------- .../ChangedChapterLength.pass | 20 +++++++ .../ChangedChapterTitle.pass | 20 +++++++ xml.multiview/test/unit/data/sample.book | 20 +++++++ 5 files changed, 88 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties ---------------------------------------------------------------------- diff --git a/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties b/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties index 25df397..d6b2c87 100644 --- a/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties +++ b/xml.multiview/src/org/netbeans/modules/xml/multiview/Bundle.properties @@ -1,44 +1,19 @@ -# 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 1997-2010 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]" -# -# Contributor(s): -# -# The Original Software is Forte for Java, Community Edition. The Initial -# Developer of the Original Software is Sun Microsystems, Inc. Portions -# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. -# -# 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. +# 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. # Module manifest localization OpenIDE-Module-Name=XML Multiview Editor http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties ---------------------------------------------------------------------- diff --git a/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties b/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties index 86b76a7..e37b3de 100644 --- a/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties +++ b/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/Bundle.properties @@ -1,46 +1,19 @@ +# 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 # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# 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]" -# -# Contributor(s): -# -# The Original Software is Forte for Java, Community Edition. The Initial -# Developer of the Original Software is Sun Microsystems, Inc. Portions -# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. -# -# 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. +# 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. LBL_Add=&Add... HINT_Add=Add http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass ---------------------------------------------------------------------- diff --git a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass index 0450fe1..e3c7d27 100644 --- a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass +++ b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterLength.pass @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://book.dtd"> <book instock="yes"> <title lang="en">A bean on the beach</title> http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass ---------------------------------------------------------------------- diff --git a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass index 480a290..6b62586 100644 --- a/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass +++ b/xml.multiview/test/unit/data/goldenfiles/org/netbeans/modules/xml/multiview/test/XmlMultiViewEditorTest/ChangedChapterTitle.pass @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://book.dtd"> <book instock="yes"> <title lang="en">A bean on the beach</title> http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c7cc9953/xml.multiview/test/unit/data/sample.book ---------------------------------------------------------------------- diff --git a/xml.multiview/test/unit/data/sample.book b/xml.multiview/test/unit/data/sample.book index 798e811..fe9ea96 100644 --- a/xml.multiview/test/unit/data/sample.book +++ b/xml.multiview/test/unit/data/sample.book @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <!DOCTYPE book PUBLIC "-//BookCompany//Entity ID//EN" "file://sample.dtd"> <book instock="yes"> <title lang="en">A bean on the beach</title>
