From 74703b449349b25c07caa3abad258f20d87f6313 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Tue, 12 Jan 2010 15:19:24 -0800 Subject: [PATCH] 6915502: Legal notice repairs needed in jdk/make/modules/tools Fix the legal notice in jdk/make/modules/tools Reviewed-by: tbell --- jdk/make/modules/tools/build.xml | 44 ++++++++-------- .../tools/nbproject/project.properties | 40 +++++++-------- jdk/make/modules/tools/nbproject/project.xml | 51 +++++++++---------- 3 files changed, 60 insertions(+), 75 deletions(-) diff --git a/jdk/make/modules/tools/build.xml b/jdk/make/modules/tools/build.xml index 993ccb8de07..c52de21af90 100644 --- a/jdk/make/modules/tools/build.xml +++ b/jdk/make/modules/tools/build.xml @@ -1,32 +1,28 @@ + + diff --git a/jdk/make/modules/tools/nbproject/project.properties b/jdk/make/modules/tools/nbproject/project.properties index 00b74962d97..84df879f82b 100644 --- a/jdk/make/modules/tools/nbproject/project.properties +++ b/jdk/make/modules/tools/nbproject/project.properties @@ -1,32 +1,26 @@ # # Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun in the LICENSE file that accompanied this code. # -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). # -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # -# - Neither the name of Sun Microsystems nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. # application.title=classanalyzer diff --git a/jdk/make/modules/tools/nbproject/project.xml b/jdk/make/modules/tools/nbproject/project.xml index 61955a8eac5..bd83ccaeb9b 100644 --- a/jdk/make/modules/tools/nbproject/project.xml +++ b/jdk/make/modules/tools/nbproject/project.xml @@ -1,34 +1,29 @@ + org.netbeans.modules.java.j2seproject