[netbeans] branch cnd updated: Replace Oracle license with ALv2 license header in Bundle.properties files.

matthiasblaesing Sun, 02 Aug 2020 11:58:13 -0700

This is an automated email from the ASF dual-hosted git repository.

matthiasblaesing pushed a commit to branch cnd
in repository https://gitbox.apache.org/repos/asf/netbeans.git



The following commit(s) were added to refs/heads/cnd by this push:
     new 201961d  Replace Oracle license with ALv2 license header in 
Bundle.properties files.
     new 6efea7d  Merge pull request #2291 from 
BradWalker/cnd_cleanup_props_file
201961d is described below

commit 201961d1b60aba2f754d30794002c3ac83c2d4a0
Author: Brad Walker <[email protected]>
AuthorDate: Sun Aug 2 13:22:58 2020 -0500

    Replace Oracle license with ALv2 license header in Bundle.properties files.
    
    These files were part of the Oracle Netbeans donation #4 & #5.
---
 .../cnd/api/model/resources/Bundle.properties      | 47 ++++++-------------
 .../org/netbeans/modules/cnd/apt/Bundle.properties | 47 ++++++-------------
 .../cnd/classview/actions/Bundle.properties        | 47 ++++++-------------
 .../cnd/classview/resources/Bundle.properties      | 47 ++++++-------------
 .../modules/cnd/discovery/Bundle.properties        | 47 ++++++-------------
 .../cnd/discovery/projectimport/Bundle.properties  | 47 ++++++-------------
 .../modules/cnd/discovery/wizard/Bundle.properties | 37 +--------------
 .../discovery/wizard/api/support/Bundle.properties | 47 ++++++-------------
 .../wizard/support/impl/Bundle.properties          | 49 ++++++--------------
 .../modules/cnd/dwarfdiscovery/Bundle.properties   | 47 ++++++-------------
 .../cnd/dwarfdiscovery/provider/Bundle.properties  | 47 ++++++-------------
 .../cnd/dwarfdump/resources/Bundle.properties      | 47 ++++++-------------
 .../modules/cnd/highlight/error/Bundle.properties  | 47 ++++++-------------
 .../cnd/highlight/error/includes/Bundle.properties | 49 ++++++--------------
 .../cnd/highlight/resources/Bundle.properties      | 47 ++++++-------------
 .../cnd/highlight/semantic/Bundle.properties       | 47 ++++++-------------
 .../ui/configurations/Bundle.properties            | 47 ++++++-------------
 .../modules/cnd/modeldiscovery/Bundle.properties   | 47 ++++++-------------
 .../cnd/modeldiscovery/provider/Bundle.properties  | 47 ++++++-------------
 .../cnd/modelimpl/platform/Bundle.properties       | 47 ++++++-------------
 .../cnd/modelimpl/resources/Bundle.properties      | 47 ++++++-------------
 .../netbeans/modules/cnd/modelui/Bundle.properties | 47 ++++++-------------
 .../modules/cnd/modelui/actions/Bundle.properties  | 47 ++++++-------------
 .../modules/cnd/modelui/parsing/Bundle.properties  | 47 ++++++-------------
 .../modules/cnd/modelui/switcher/Bundle.properties | 47 ++++++-------------
 .../modules/cnd/modelui/trace/Bundle.properties    | 47 ++++++-------------
 .../cnd/modelutil/resources/Bundle.properties      | 47 ++++++-------------
 .../modules/cnd/remote/ui/Bundle.properties        | 54 ++++++----------------
 .../cnd/repository/resources/Bundle.properties     | 47 ++++++-------------
 .../cnd/toolchain/ui/compilerset/Bundle.properties | 47 ++++++-------------
 .../cnd/toolchain/ui/options/Bundle.properties     | 47 ++++++-------------
 .../modules/cnd/api/toolchain/Bundle.properties    | 49 ++++++--------------
 .../modules/cnd/spi/toolchain/Bundle.properties    | 47 ++++++-------------
 .../cnd/toolchain/compilerset/Bundle.properties    | 47 ++++++-------------
 .../modules/cnd/ui/options/Bundle.properties       | 47 ++++++-------------
 .../diagnostics/clank/resources/Bundle.properties  | 19 +++++++-
 .../netbeans/modules/odcs/cnd/ui/Bundle.properties | 17 +++++++
 37 files changed, 516 insertions(+), 1168 deletions(-)

diff --git 
a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
 
b/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
index bcc0e19..0fe31d7 100644
--- 
a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
+++ 
b/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/Bundle.properties 
b/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/Bundle.properties
index 94e4e68..be9e6ec 100644
--- a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/Bundle.properties
+++ b/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/Bundle.properties
 
b/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/Bundle.properties
index 6a689d1..52e454b 100644
--- 
a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/Bundle.properties
+++ 
b/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 CTL_SelectInClasses=Classes
 CTL_NavigateSelectInClasses=Select in &Classes
diff --git 
a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/Bundle.properties
 
b/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/Bundle.properties
index 923c651..27694fc 100644
--- 
a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/Bundle.properties
+++ 
b/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Name=C/C++ Class View
diff --git 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/Bundle.properties 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/Bundle.properties
index c0af0c2..1c60737 100644
--- a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/Bundle.properties
+++ b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/Bundle.properties
 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/Bundle.properties
index fa9d43f..d5a5ce7 100644
--- 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/Bundle.properties
+++ 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/projectimport/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 ConfigureActionName=Configure
 
diff --git 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties
 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties
index 100b276..aa17c6b 100644
--- 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties
+++ 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties
@@ -1,38 +1,3 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
-#
-# You may use the binary however you like. The source file license is:
-#
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
 
 WIZARD_TITLE_TXT=Configure Code Assistance Wizard
 ACTION_TITLE_TXT=Configure Code Assistance...
@@ -136,4 +101,4 @@ CannotAnalyzeBuildLog=Cannot analyze build log {0}
 NoExecutable_NoBaseFolder=No binary file or folder in input parameters
 SelectModeRootFolderError="{0}" is not a folder
 ProviderControlFolderError="{0}" is not a folder
-ProviderControlFileError=File "{0}" not found
\ No newline at end of file
+ProviderControlFileError=File "{0}" not found
diff --git 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/api/support/Bundle.properties
 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/api/support/Bundle.properties
index fdce1fd..4286ce3 100644
--- 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/api/support/Bundle.properties
+++ 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/api/support/Bundle.properties
@@ -1,37 +1,18 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 FixInclude.Progress.AnalyzeRoot=Check Included Files...
diff --git 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/support/impl/Bundle.properties
 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/support/impl/Bundle.properties
index bc59c0a..2930d8a 100644
--- 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/support/impl/Bundle.properties
+++ 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/support/impl/Bundle.properties
@@ -1,37 +1,18 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
-UpdateCodeAssistance=Update Code Assistance
\ No newline at end of file
+UpdateCodeAssistance=Update Code Assistance
diff --git 
a/cnd/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/Bundle.properties
 
b/cnd/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/Bundle.properties
index 91fb182..f5e4ecd 100644
--- 
a/cnd/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/Bundle.properties
+++ 
b/cnd/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle.properties
 
b/cnd/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle.properties
index d830d9d..26e2fde 100644
--- 
a/cnd/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle.properties
+++ 
b/cnd/cnd.dwarfdiscovery/src/org/netbeans/modules/cnd/dwarfdiscovery/provider/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 # Sample ResourceBundle properties file
 Binaries_Provider_Name=Analyze Object and Executable Files
diff --git 
a/cnd/cnd.dwarfdump/src/org/netbeans/modules/cnd/dwarfdump/resources/Bundle.properties
 
b/cnd/cnd.dwarfdump/src/org/netbeans/modules/cnd/dwarfdump/resources/Bundle.properties
index de99807..20112c9 100644
--- 
a/cnd/cnd.dwarfdump/src/org/netbeans/modules/cnd/dwarfdump/resources/Bundle.properties
+++ 
b/cnd/cnd.dwarfdump/src/org/netbeans/modules/cnd/dwarfdump/resources/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/error/Bundle.properties
 
b/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/error/Bundle.properties
index 13535ce..6982df0 100644
--- 
a/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/error/Bundle.properties
+++ 
b/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/error/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 LABL_CppParserAnnotationError=C/C++ parser errors
 HighlightProvider_HyperlinkActionsHints={0}\nFor extra info hold {1} and move 
mouse over include directive
diff --git 
a/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/error/includes/Bundle.properties
 
b/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/error/includes/Bundle.properties
index 9f4142f..dd085ad 100644
--- 
a/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/error/includes/Bundle.properties
+++ 
b/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/error/includes/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 ErrorIncludeDialog_Title=Failed #include/#error Directives
 ErrorIncludeDialog_AccessibleName=View failed preprocessor directives
@@ -57,4 +38,4 @@ SourceUserPaths=User include paths for source file:
 SourceSystemPaths=System include paths for source file:
 
 ErrorIncludeMenu_Title=Failed #include/#error Directives...
-MSG_Loading=Loading...
\ No newline at end of file
+MSG_Loading=Loading...
diff --git 
a/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/Bundle.properties
 
b/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/Bundle.properties
index 0677d86..165fc73 100644
--- 
a/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/Bundle.properties
+++ 
b/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/resources/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/Bundle.properties
 
b/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/Bundle.properties
index 90344ac..6c09f9a 100644
--- 
a/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/Bundle.properties
+++ 
b/cnd/cnd.highlight/src/org/netbeans/modules/cnd/highlight/semantic/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 CppParserMarkOccurrencesAnnotation=Mark Occurrences
 LABL_CppMarkOccurrencesAnnotation=Mark Occurrences for C/C++ editor
diff --git 
a/cnd/cnd.makeproject.ui/src/org/netbeans/modules/cnd/makeproject/ui/configurations/Bundle.properties
 
b/cnd/cnd.makeproject.ui/src/org/netbeans/modules/cnd/makeproject/ui/configurations/Bundle.properties
index 0fd1777..09c33af 100644
--- 
a/cnd/cnd.makeproject.ui/src/org/netbeans/modules/cnd/makeproject/ui/configurations/Bundle.properties
+++ 
b/cnd/cnd.makeproject.ui/src/org/netbeans/modules/cnd/makeproject/ui/configurations/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 # Sample ResourceBundle properties file
 
diff --git 
a/cnd/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/Bundle.properties
 
b/cnd/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/Bundle.properties
index 0c08bb2..b995a99 100644
--- 
a/cnd/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/Bundle.properties
+++ 
b/cnd/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/Bundle.properties
 
b/cnd/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/Bundle.properties
index 7698c84..bb550c8 100644
--- 
a/cnd/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/Bundle.properties
+++ 
b/cnd/cnd.modeldiscovery/src/org/netbeans/modules/cnd/modeldiscovery/provider/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 # analyze object files in folder
 Model_Provider_Name=Search file system for C/C++ header files
diff --git 
a/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/platform/Bundle.properties
 
b/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/platform/Bundle.properties
index acd8060..d6ee8b6 100644
--- 
a/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/platform/Bundle.properties
+++ 
b/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/platform/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 MSG_ParsingProgress=Parsing {0} ...
 MSG_CodeAssistanceInitializationTask=Initializing Code Assistance for {0}.
diff --git 
a/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/resources/Bundle.properties
 
b/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/resources/Bundle.properties
index 692fb5d..7da9ea8 100644
--- 
a/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/resources/Bundle.properties
+++ 
b/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/resources/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/Bundle.properties 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/Bundle.properties
index 84e5f22..4f61ef3 100644
--- a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/Bundle.properties
+++ b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/actions/Bundle.properties
 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/actions/Bundle.properties
index 2b258f4..a5b889e 100644
--- 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/actions/Bundle.properties
+++ 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/actions/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 CTL_ReparseProject=Reparse Project
 CTL_ReparseProjects=Reparse {0} Projects
diff --git 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/parsing/Bundle.properties
 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/parsing/Bundle.properties
index 66d1d8c..48eb7be 100644
--- 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/parsing/Bundle.properties
+++ 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/parsing/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 MSG_LowMemory=Lack of memory
 
diff --git 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/switcher/Bundle.properties
 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/switcher/Bundle.properties
index cd98951..750956a 100644
--- 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/switcher/Bundle.properties
+++ 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/switcher/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 CTL_SwitcherDialogAction=C/C++ Code Assistance
 CTL_SwitchProjectAction=C/C++ Code Assistance
diff --git 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/trace/Bundle.properties 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/trace/Bundle.properties
index 045966a..a252073 100644
--- 
a/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/trace/Bundle.properties
+++ 
b/cnd/cnd.modelui/src/org/netbeans/modules/cnd/modelui/trace/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 CTL_TestProjectReferencesAction=Resolving: Test All References
 CTL_TestProjectReferencesPerformanceAction=Performance: Test All References...
diff --git 
a/cnd/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/resources/Bundle.properties
 
b/cnd/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/resources/Bundle.properties
index 74912cc..c2892db 100644
--- 
a/cnd/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/resources/Bundle.properties
+++ 
b/cnd/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/resources/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.remote.ui/src/org/netbeans/modules/cnd/remote/ui/Bundle.properties 
b/cnd/cnd.remote.ui/src/org/netbeans/modules/cnd/remote/ui/Bundle.properties
index 53560ed..ef185e2 100644
--- a/cnd/cnd.remote.ui/src/org/netbeans/modules/cnd/remote/ui/Bundle.properties
+++ b/cnd/cnd.remote.ui/src/org/netbeans/modules/cnd/remote/ui/Bundle.properties
@@ -1,43 +1,19 @@
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2010 Oracle and/or its affiliates. All rights reserved.
+# 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
 #
-# 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):
- 
-# Portions Copyrighted 2008 Sun Microsystems, Inc.
+#   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.
 
 # AddServerDialog
 LBL_ServerTF=&Development Server:
diff --git 
a/cnd/cnd.repository/src/org/netbeans/modules/cnd/repository/resources/Bundle.properties
 
b/cnd/cnd.repository/src/org/netbeans/modules/cnd/repository/resources/Bundle.properties
index 1b4354c..a2717d3 100644
--- 
a/cnd/cnd.repository/src/org/netbeans/modules/cnd/repository/resources/Bundle.properties
+++ 
b/cnd/cnd.repository/src/org/netbeans/modules/cnd/repository/resources/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 OpenIDE-Module-Display-Category=C/C++
 OpenIDE-Module-Long-Description=\
diff --git 
a/cnd/cnd.toolchain.ui/src/org/netbeans/modules/cnd/toolchain/ui/compilerset/Bundle.properties
 
b/cnd/cnd.toolchain.ui/src/org/netbeans/modules/cnd/toolchain/ui/compilerset/Bundle.properties
index bae0c04..f0b3457 100644
--- 
a/cnd/cnd.toolchain.ui/src/org/netbeans/modules/cnd/toolchain/ui/compilerset/Bundle.properties
+++ 
b/cnd/cnd.toolchain.ui/src/org/netbeans/modules/cnd/toolchain/ui/compilerset/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 NO_COMPILERS_FOUND_MSG=\
 No suitable compilers were found on your system. The IDE needs a suitable set 
of compilers and other build tools in order to work correctly.\n\n\
diff --git 
a/cnd/cnd.toolchain.ui/src/org/netbeans/modules/cnd/toolchain/ui/options/Bundle.properties
 
b/cnd/cnd.toolchain.ui/src/org/netbeans/modules/cnd/toolchain/ui/options/Bundle.properties
index b99807c..ad56fc2 100644
--- 
a/cnd/cnd.toolchain.ui/src/org/netbeans/modules/cnd/toolchain/ui/options/Bundle.properties
+++ 
b/cnd/cnd.toolchain.ui/src/org/netbeans/modules/cnd/toolchain/ui/options/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 CndOptions_Title=C/C++ Settings
 CndOptionsCategory_Name=&C/C++
diff --git 
a/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/api/toolchain/Bundle.properties
 
b/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/api/toolchain/Bundle.properties
index 79cf88d..d3e544e 100644
--- 
a/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/api/toolchain/Bundle.properties
+++ 
b/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/api/toolchain/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 CCompiler=C Compiler
 CCCompiler=C++ Compiler
@@ -44,4 +25,4 @@ DebuggerTool=Debugger
 QMakeTool=QMake Tool
 CMakeTool=CMake Tool
 UnknownTool=Unknown Tool
-PROGRESS_TEXT=Initializing tools collections on {0}
\ No newline at end of file
+PROGRESS_TEXT=Initializing tools collections on {0}
diff --git 
a/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/spi/toolchain/Bundle.properties
 
b/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/spi/toolchain/Bundle.properties
index bb5eade..33b91f3 100644
--- 
a/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/spi/toolchain/Bundle.properties
+++ 
b/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/spi/toolchain/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 DetectHostInfo=\
 findInPath() {\n\
diff --git 
a/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/compilerset/Bundle.properties
 
b/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/compilerset/Bundle.properties
index e8300dd..46efa67 100644
--- 
a/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/compilerset/Bundle.properties
+++ 
b/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/compilerset/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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_EmptyCompilerSetName=None
 LBL_EmptyCompilerSetDisplayName=No Compilers Found
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/ui/options/Bundle.properties 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/ui/options/Bundle.properties
index 5fe54cf..4f8554d 100644
--- a/cnd/cnd.ui/src/org/netbeans/modules/cnd/ui/options/Bundle.properties
+++ b/cnd/cnd.ui/src/org/netbeans/modules/cnd/ui/options/Bundle.properties
@@ -1,38 +1,19 @@
-# This module is part of NetBeans and is open-source.
-# You can see http://www.netbeans.org/about/legal/index.html for details.
+# 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
 #
-# You may use the binary however you like. The source file license is:
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# 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 NetBeans. The Initial Developer of the Original
-# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-# Microsystems, Inc. All Rights Reserved.
+# 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.
 
 # OtherOptionsPanel
 TAB_CndOtherOptionsTab=Other
diff --git 
a/contrib/cnd.diagnostics.clank/src/org/netbeans/modules/cnd/diagnostics/clank/resources/Bundle.properties
 
b/contrib/cnd.diagnostics.clank/src/org/netbeans/modules/cnd/diagnostics/clank/resources/Bundle.properties
index c79e7e6..c5f06aa 100644
--- 
a/contrib/cnd.diagnostics.clank/src/org/netbeans/modules/cnd/diagnostics/clank/resources/Bundle.properties
+++ 
b/contrib/cnd.diagnostics.clank/src/org/netbeans/modules/cnd/diagnostics/clank/resources/Bundle.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.
+
 OpenIDE-Module-Name=C/C++ JClank Diagnostics
 HINT_DIAGNOSTIC_PIN=Clank Diagnostic Error Path Details
-LAB_diagnostics-error=Clank Diagnostics Error
\ No newline at end of file
+LAB_diagnostics-error=Clank Diagnostics Error
diff --git 
a/contrib/odcs.cnd/src/org/netbeans/modules/odcs/cnd/ui/Bundle.properties 
b/contrib/odcs.cnd/src/org/netbeans/modules/odcs/cnd/ui/Bundle.properties
index 1fa99ac..1c980d5 100644
--- a/contrib/odcs.cnd/src/org/netbeans/modules/odcs/cnd/ui/Bundle.properties
+++ b/contrib/odcs.cnd/src/org/netbeans/modules/odcs/cnd/ui/Bundle.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.
+
 DevelopVMConnectionPanel.userLabel.text=User:
 DevelopVMConnectionPanel.hostLabel.text=Host:
 DevelopVMConnectionPanel.userField.text=


---------------------------------------------------------------------
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

[netbeans] branch cnd updated: Replace Oracle license with ALv2 license header in Bundle.properties files.

Reply via email to