You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2022/12/08 13:14:32 UTC

[netbeans-native-installers] 02/19: [NETBEANS-54] First batch of license header changes to Apache

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

skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-native-installers.git

commit bca92aac611fa23fcf17392ad292c2de8db1ba65
Author: geertjan <ge...@oracle.com>
AuthorDate: Thu Sep 21 08:59:22 2017 -0400

    [NETBEANS-54] First batch of license header changes to Apache
---
 build.properties                                  | 48 ++++++---------------
 build.xml                                         | 48 +++++++--------------
 cleaner/unix/src/cleaner.sh                       | 48 ++++++---------------
 cleaner/windows/Makefile                          | 48 ++++++---------------
 cleaner/windows/nbproject/configurations.xml      | 48 +++++++--------------
 cleaner/windows/nbproject/project.properties      | 48 ++++++---------------
 cleaner/windows/nbproject/project.xml             | 48 +++++++--------------
 cleaner/windows/src/main.c                        | 50 +++++++---------------
 jnilib/.common/src/CommonUtils.c                  | 50 +++++++---------------
 jnilib/.common/src/CommonUtils.h                  | 50 +++++++---------------
 jnilib/.unix/src/jni_UnixNativeUtils.c            | 50 +++++++---------------
 jnilib/.unix/src/jni_UnixNativeUtils.h            | 50 +++++++---------------
 jnilib/linux/Makefile                             | 48 ++++++---------------
 jnilib/linux/nbproject/configurations.xml         | 48 +++++++--------------
 jnilib/linux/nbproject/project.properties         | 48 ++++++---------------
 jnilib/linux/nbproject/project.xml                | 48 +++++++--------------
 jnilib/macosx/Makefile                            | 48 ++++++---------------
 jnilib/macosx/nbproject/configurations.xml        | 47 ++++++--------------
 jnilib/macosx/nbproject/project.properties        | 48 ++++++---------------
 jnilib/macosx/nbproject/project.xml               | 48 +++++++--------------
 jnilib/solaris-sparc/Makefile                     | 48 ++++++---------------
 jnilib/solaris-sparc/nbproject/configurations.xml | 48 +++++++--------------
 jnilib/solaris-sparc/nbproject/project.properties | 48 ++++++---------------
 jnilib/solaris-sparc/nbproject/project.xml        | 48 +++++++--------------
 jnilib/solaris-x86/Makefile                       | 48 ++++++---------------
 jnilib/solaris-x86/nbproject/configurations.xml   | 48 +++++++--------------
 jnilib/solaris-x86/nbproject/project.properties   | 48 ++++++---------------
 jnilib/solaris-x86/nbproject/project.xml          | 48 +++++++--------------
 jnilib/windows/Makefile                           | 48 ++++++---------------
 jnilib/windows/nbproject/configurations.xml       | 48 +++++++--------------
 jnilib/windows/nbproject/project.properties       | 48 ++++++---------------
 jnilib/windows/nbproject/project.xml              | 48 +++++++--------------
 jnilib/windows/src/WindowsUtils.c                 | 50 +++++++---------------
 jnilib/windows/src/WindowsUtils.h                 | 50 +++++++---------------
 jnilib/windows/src/jni_WindowsNativeUtils.c       | 50 +++++++---------------
 jnilib/windows/src/jni_WindowsNativeUtils.h       | 50 +++++++---------------
 jnilib/windows/src/jni_WindowsRegistry.c          | 50 +++++++---------------
 jnilib/windows/src/jni_WindowsRegistry.h          | 50 +++++++---------------
 launcher/unix/i18n/launcher.properties            | 48 ++++++---------------
 launcher/unix/src/launcher.sh                     | 48 ++++++---------------
 launcher/windows/Makefile                         | 48 ++++++---------------
 launcher/windows/i18n/launcher.properties         | 48 ++++++---------------
 launcher/windows/nbproject/configurations.xml     | 47 ++++++--------------
 launcher/windows/nbproject/project.properties     | 48 ++++++---------------
 launcher/windows/nbproject/project.xml            | 48 +++++++--------------
 launcher/windows/resources/res.rc                 | 52 +++++++----------------
 launcher/windows/src/Errors.h                     | 50 +++++++---------------
 launcher/windows/src/ExtractUtils.c               | 50 +++++++---------------
 launcher/windows/src/ExtractUtils.h               | 50 +++++++---------------
 launcher/windows/src/FileUtils.c                  | 50 +++++++---------------
 launcher/windows/src/FileUtils.h                  | 50 +++++++---------------
 launcher/windows/src/JavaUtils.c                  | 50 +++++++---------------
 launcher/windows/src/JavaUtils.h                  | 50 +++++++---------------
 launcher/windows/src/Launcher.c                   | 50 +++++++---------------
 launcher/windows/src/Launcher.h                   | 50 +++++++---------------
 launcher/windows/src/Main.c                       | 50 +++++++---------------
 launcher/windows/src/Main.h                       | 50 +++++++---------------
 launcher/windows/src/ProcessUtils.c               | 50 +++++++---------------
 launcher/windows/src/ProcessUtils.h               | 50 +++++++---------------
 launcher/windows/src/RegistryUtils.c              | 50 +++++++---------------
 launcher/windows/src/RegistryUtils.h              | 50 +++++++---------------
 launcher/windows/src/StringUtils.c                | 50 +++++++---------------
 launcher/windows/src/StringUtils.h                | 50 +++++++---------------
 launcher/windows/src/SystemUtils.c                | 50 +++++++---------------
 launcher/windows/src/SystemUtils.h                | 50 +++++++---------------
 launcher/windows/src/Types.h                      | 50 +++++++---------------
 66 files changed, 969 insertions(+), 2263 deletions(-)

diff --git a/build.properties b/build.properties
index 4359a3b..5959d93 100644
--- a/build.properties
+++ b/build.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #ignore.native=
diff --git a/build.xml b/build.xml
index 2378874..58c97a6 100644
--- a/build.xml
+++ b/build.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <project name="native" default="default" basedir=".">
diff --git a/cleaner/unix/src/cleaner.sh b/cleaner/unix/src/cleaner.sh
index 4d91691..cfae216 100644
--- a/cleaner/unix/src/cleaner.sh
+++ b/cleaner/unix/src/cleaner.sh
@@ -1,41 +1,21 @@
 #!/bin/sh
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 deleteFiles() {
diff --git a/cleaner/windows/Makefile b/cleaner/windows/Makefile
index bf5b7f9..98cf53c 100644
--- a/cleaner/windows/Makefile
+++ b/cleaner/windows/Makefile
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 # Environment 
diff --git a/cleaner/windows/nbproject/configurations.xml b/cleaner/windows/nbproject/configurations.xml
index 83d7e4b..b16b628 100644
--- a/cleaner/windows/nbproject/configurations.xml
+++ b/cleaner/windows/nbproject/configurations.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <configurationDescriptor version="35">
diff --git a/cleaner/windows/nbproject/project.properties b/cleaner/windows/nbproject/project.properties
index 75bafc2..3807b67 100644
--- a/cleaner/windows/nbproject/project.properties
+++ b/cleaner/windows/nbproject/project.properties
@@ -1,40 +1,20 @@
 
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
diff --git a/cleaner/windows/nbproject/project.xml b/cleaner/windows/nbproject/project.xml
index d8bb645..ded3e3c 100644
--- a/cleaner/windows/nbproject/project.xml
+++ b/cleaner/windows/nbproject/project.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <project xmlns="http://www.netbeans.org/ns/project/1">
diff --git a/cleaner/windows/src/main.c b/cleaner/windows/src/main.c
index 21d2d9d..2743377 100644
--- a/cleaner/windows/src/main.c
+++ b/cleaner/windows/src/main.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-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.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <windows.h>
diff --git a/jnilib/.common/src/CommonUtils.c b/jnilib/.common/src/CommonUtils.c
index 9699f2a..3984628 100644
--- a/jnilib/.common/src/CommonUtils.c
+++ b/jnilib/.common/src/CommonUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/.common/src/CommonUtils.h b/jnilib/.common/src/CommonUtils.h
index 5047daf..b11aacd 100644
--- a/jnilib/.common/src/CommonUtils.h
+++ b/jnilib/.common/src/CommonUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/.unix/src/jni_UnixNativeUtils.c b/jnilib/.unix/src/jni_UnixNativeUtils.c
index 8b4489c..24da65d 100644
--- a/jnilib/.unix/src/jni_UnixNativeUtils.c
+++ b/jnilib/.unix/src/jni_UnixNativeUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/.unix/src/jni_UnixNativeUtils.h b/jnilib/.unix/src/jni_UnixNativeUtils.h
index 8f8c92c..654e750 100644
--- a/jnilib/.unix/src/jni_UnixNativeUtils.h
+++ b/jnilib/.unix/src/jni_UnixNativeUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-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.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/linux/Makefile b/jnilib/linux/Makefile
index 64e76e1..516847d 100644
--- a/jnilib/linux/Makefile
+++ b/jnilib/linux/Makefile
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #
diff --git a/jnilib/linux/nbproject/configurations.xml b/jnilib/linux/nbproject/configurations.xml
index 018e1ec..9e8e8b1 100644
--- a/jnilib/linux/nbproject/configurations.xml
+++ b/jnilib/linux/nbproject/configurations.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <configurationDescriptor version="35">
diff --git a/jnilib/linux/nbproject/project.properties b/jnilib/linux/nbproject/project.properties
index 75bafc2..3807b67 100644
--- a/jnilib/linux/nbproject/project.properties
+++ b/jnilib/linux/nbproject/project.properties
@@ -1,40 +1,20 @@
 
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
diff --git a/jnilib/linux/nbproject/project.xml b/jnilib/linux/nbproject/project.xml
index f47994a..4e61d3b 100644
--- a/jnilib/linux/nbproject/project.xml
+++ b/jnilib/linux/nbproject/project.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <project xmlns="http://www.netbeans.org/ns/project/1">
diff --git a/jnilib/macosx/Makefile b/jnilib/macosx/Makefile
index 64e76e1..516847d 100644
--- a/jnilib/macosx/Makefile
+++ b/jnilib/macosx/Makefile
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #
diff --git a/jnilib/macosx/nbproject/configurations.xml b/jnilib/macosx/nbproject/configurations.xml
index d08e612..50ab41e 100644
--- a/jnilib/macosx/nbproject/configurations.xml
+++ b/jnilib/macosx/nbproject/configurations.xml
@@ -1,42 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 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.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-If 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):
 -->
 <configurationDescriptor version="45">
   <logicalFolder name="root" displayName="root" projectFiles="true">
diff --git a/jnilib/macosx/nbproject/project.properties b/jnilib/macosx/nbproject/project.properties
index 75bafc2..3807b67 100644
--- a/jnilib/macosx/nbproject/project.properties
+++ b/jnilib/macosx/nbproject/project.properties
@@ -1,40 +1,20 @@
 
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
diff --git a/jnilib/macosx/nbproject/project.xml b/jnilib/macosx/nbproject/project.xml
index 08fb3de..1825876 100644
--- a/jnilib/macosx/nbproject/project.xml
+++ b/jnilib/macosx/nbproject/project.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.cnd.makeproject</type>
diff --git a/jnilib/solaris-sparc/Makefile b/jnilib/solaris-sparc/Makefile
index 64e76e1..516847d 100644
--- a/jnilib/solaris-sparc/Makefile
+++ b/jnilib/solaris-sparc/Makefile
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #
diff --git a/jnilib/solaris-sparc/nbproject/configurations.xml b/jnilib/solaris-sparc/nbproject/configurations.xml
index f37cec3..98c3b5c 100644
--- a/jnilib/solaris-sparc/nbproject/configurations.xml
+++ b/jnilib/solaris-sparc/nbproject/configurations.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <configurationDescriptor version="35">
diff --git a/jnilib/solaris-sparc/nbproject/project.properties b/jnilib/solaris-sparc/nbproject/project.properties
index 75bafc2..3807b67 100644
--- a/jnilib/solaris-sparc/nbproject/project.properties
+++ b/jnilib/solaris-sparc/nbproject/project.properties
@@ -1,40 +1,20 @@
 
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
diff --git a/jnilib/solaris-sparc/nbproject/project.xml b/jnilib/solaris-sparc/nbproject/project.xml
index be61aca..c6febe0 100644
--- a/jnilib/solaris-sparc/nbproject/project.xml
+++ b/jnilib/solaris-sparc/nbproject/project.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <project xmlns="http://www.netbeans.org/ns/project/1">
diff --git a/jnilib/solaris-x86/Makefile b/jnilib/solaris-x86/Makefile
index 64e76e1..516847d 100644
--- a/jnilib/solaris-x86/Makefile
+++ b/jnilib/solaris-x86/Makefile
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #
diff --git a/jnilib/solaris-x86/nbproject/configurations.xml b/jnilib/solaris-x86/nbproject/configurations.xml
index ec55f70..18c1468 100644
--- a/jnilib/solaris-x86/nbproject/configurations.xml
+++ b/jnilib/solaris-x86/nbproject/configurations.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <configurationDescriptor version="35">
diff --git a/jnilib/solaris-x86/nbproject/project.properties b/jnilib/solaris-x86/nbproject/project.properties
index 75bafc2..3807b67 100644
--- a/jnilib/solaris-x86/nbproject/project.properties
+++ b/jnilib/solaris-x86/nbproject/project.properties
@@ -1,40 +1,20 @@
 
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
diff --git a/jnilib/solaris-x86/nbproject/project.xml b/jnilib/solaris-x86/nbproject/project.xml
index 3fd2701..fdb4477 100644
--- a/jnilib/solaris-x86/nbproject/project.xml
+++ b/jnilib/solaris-x86/nbproject/project.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <project xmlns="http://www.netbeans.org/ns/project/1">
diff --git a/jnilib/windows/Makefile b/jnilib/windows/Makefile
index 64e76e1..516847d 100644
--- a/jnilib/windows/Makefile
+++ b/jnilib/windows/Makefile
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #
diff --git a/jnilib/windows/nbproject/configurations.xml b/jnilib/windows/nbproject/configurations.xml
index 8cb7437..b7731b5 100644
--- a/jnilib/windows/nbproject/configurations.xml
+++ b/jnilib/windows/nbproject/configurations.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <configurationDescriptor version="35">
diff --git a/jnilib/windows/nbproject/project.properties b/jnilib/windows/nbproject/project.properties
index 75bafc2..3807b67 100644
--- a/jnilib/windows/nbproject/project.properties
+++ b/jnilib/windows/nbproject/project.properties
@@ -1,40 +1,20 @@
 
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
diff --git a/jnilib/windows/nbproject/project.xml b/jnilib/windows/nbproject/project.xml
index a3307ff..1aa64eb 100644
--- a/jnilib/windows/nbproject/project.xml
+++ b/jnilib/windows/nbproject/project.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-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.
+      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.
 
-  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.
-  
-  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.
 -->
 
 <project xmlns="http://www.netbeans.org/ns/project/1">
diff --git a/jnilib/windows/src/WindowsUtils.c b/jnilib/windows/src/WindowsUtils.c
index b658710..ed5d835 100644
--- a/jnilib/windows/src/WindowsUtils.c
+++ b/jnilib/windows/src/WindowsUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/windows/src/WindowsUtils.h b/jnilib/windows/src/WindowsUtils.h
index 4a8868c..eaa2aeb 100644
--- a/jnilib/windows/src/WindowsUtils.h
+++ b/jnilib/windows/src/WindowsUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/windows/src/jni_WindowsNativeUtils.c b/jnilib/windows/src/jni_WindowsNativeUtils.c
index 762d45c..b21da67 100644
--- a/jnilib/windows/src/jni_WindowsNativeUtils.c
+++ b/jnilib/windows/src/jni_WindowsNativeUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/windows/src/jni_WindowsNativeUtils.h b/jnilib/windows/src/jni_WindowsNativeUtils.h
index 47372b4..d673d94 100644
--- a/jnilib/windows/src/jni_WindowsNativeUtils.h
+++ b/jnilib/windows/src/jni_WindowsNativeUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-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.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/windows/src/jni_WindowsRegistry.c b/jnilib/windows/src/jni_WindowsRegistry.c
index b586a2f..a157477 100644
--- a/jnilib/windows/src/jni_WindowsRegistry.c
+++ b/jnilib/windows/src/jni_WindowsRegistry.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/jnilib/windows/src/jni_WindowsRegistry.h b/jnilib/windows/src/jni_WindowsRegistry.h
index b80248b..05a144a 100644
--- a/jnilib/windows/src/jni_WindowsRegistry.h
+++ b/jnilib/windows/src/jni_WindowsRegistry.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-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.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <jni.h>
diff --git a/launcher/unix/i18n/launcher.properties b/launcher/unix/i18n/launcher.properties
index 3fbc316..73e6c6e 100644
--- a/launcher/unix/i18n/launcher.properties
+++ b/launcher/unix/i18n/launcher.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 nlu.jvm.notfoundmessage=Java SE Development Kit (JDK) was not found on this computer\nJDK 8 is required for installing the NetBeans IDE. Make sure that the JDK is properly installed and run installer again.\nYou can specify valid JDK location using {0} installer argument.\n\nTo download the JDK, visit http://www.oracle.com/technetwork/java/javase/downloads
diff --git a/launcher/unix/src/launcher.sh b/launcher/unix/src/launcher.sh
index 0db024b..31cca1d 100644
--- a/launcher/unix/src/launcher.sh
+++ b/launcher/unix/src/launcher.sh
@@ -1,41 +1,21 @@
 #!/bin/sh
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 ARG_JAVAHOME="--javahome"
diff --git a/launcher/windows/Makefile b/launcher/windows/Makefile
index 2327cb7..1debec6 100644
--- a/launcher/windows/Makefile
+++ b/launcher/windows/Makefile
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 #
diff --git a/launcher/windows/i18n/launcher.properties b/launcher/windows/i18n/launcher.properties
index c9de214..39f2b00 100644
--- a/launcher/windows/i18n/launcher.properties
+++ b/launcher/windows/i18n/launcher.properties
@@ -1,40 +1,20 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
 nlw.jvm.notfoundmessage=Java SE Development Kit (JDK) was not found on this computer\nJDK 8 or newer is required for installing the NetBeans IDE. Make sure that the JDK is properly installed and run installer again. You can specify valid JDK location using {0} installer argument.\n\nTo download the JDK, visit http://www.oracle.com/technetwork/java/javase/downloads
diff --git a/launcher/windows/nbproject/configurations.xml b/launcher/windows/nbproject/configurations.xml
index a969ca9..095caed 100644
--- a/launcher/windows/nbproject/configurations.xml
+++ b/launcher/windows/nbproject/configurations.xml
@@ -1,42 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2007, 2016 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.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-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]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-If 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):
 -->
 <configurationDescriptor version="84">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
diff --git a/launcher/windows/nbproject/project.properties b/launcher/windows/nbproject/project.properties
index 75bafc2..3807b67 100644
--- a/launcher/windows/nbproject/project.properties
+++ b/launcher/windows/nbproject/project.properties
@@ -1,40 +1,20 @@
 
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU General Public
-# License Version 2 only ("GPL") or the Common Development and Distribution
-# License("CDDL") (collectively, the "License"). You may not use this file except in
-# compliance with the License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-# License for the specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header Notice in
-# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-# designates this particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-# If applicable, add the following below the License Header, with the fields enclosed
-# by brackets [] replaced by your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-# 
-# Contributor(s):
-# 
-# The Original Software is NetBeans. The Initial Developer of the Original Software
-# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-# Rights Reserved.
-# 
-# If you wish your version of this file to be governed by only the CDDL or only the
-# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-# this software in this distribution under the [CDDL or GPL Version 2] license." If
-# you do not indicate a single choice of license, a recipient has the option to
-# distribute your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above. However, if you
-# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-# option applies only if the new code is made subject to such option by the copyright
-# holder.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 # 
 
diff --git a/launcher/windows/nbproject/project.xml b/launcher/windows/nbproject/project.xml
index d3ace8f..017b77b 100644
--- a/launcher/windows/nbproject/project.xml
+++ b/launcher/windows/nbproject/project.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright 1997-2012 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.
+      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.
 
-  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.
-  
-  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.
 -->
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.cnd.makeproject</type>
diff --git a/launcher/windows/resources/res.rc b/launcher/windows/resources/res.rc
index 02860db..b501640 100644
--- a/launcher/windows/resources/res.rc
+++ b/launcher/windows/resources/res.rc
@@ -1,42 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 2007 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]"
- *
- * 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):
+ *   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.
  */
 
 
diff --git a/launcher/windows/src/Errors.h b/launcher/windows/src/Errors.h
index ae89fa1..50a2409 100644
--- a/launcher/windows/src/Errors.h
+++ b/launcher/windows/src/Errors.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _Errors_H
diff --git a/launcher/windows/src/ExtractUtils.c b/launcher/windows/src/ExtractUtils.c
index 2ca6e5a..d96f40c 100644
--- a/launcher/windows/src/ExtractUtils.c
+++ b/launcher/windows/src/ExtractUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <windows.h>
diff --git a/launcher/windows/src/ExtractUtils.h b/launcher/windows/src/ExtractUtils.h
index 0237b75..98655b0 100644
--- a/launcher/windows/src/ExtractUtils.h
+++ b/launcher/windows/src/ExtractUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _ExtractUtils_H
diff --git a/launcher/windows/src/FileUtils.c b/launcher/windows/src/FileUtils.c
index b527182..5ab272a 100644
--- a/launcher/windows/src/FileUtils.c
+++ b/launcher/windows/src/FileUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <windows.h>
diff --git a/launcher/windows/src/FileUtils.h b/launcher/windows/src/FileUtils.h
index 4081c34..60db47b 100644
--- a/launcher/windows/src/FileUtils.h
+++ b/launcher/windows/src/FileUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _FileUtils_H
diff --git a/launcher/windows/src/JavaUtils.c b/launcher/windows/src/JavaUtils.c
index 75aec52..0f1a1dd 100644
--- a/launcher/windows/src/JavaUtils.c
+++ b/launcher/windows/src/JavaUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <wchar.h>
diff --git a/launcher/windows/src/JavaUtils.h b/launcher/windows/src/JavaUtils.h
index c541146..4508085 100644
--- a/launcher/windows/src/JavaUtils.h
+++ b/launcher/windows/src/JavaUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _JavaUtils_H
diff --git a/launcher/windows/src/Launcher.c b/launcher/windows/src/Launcher.c
index 3178f97..4c756f7 100644
--- a/launcher/windows/src/Launcher.c
+++ b/launcher/windows/src/Launcher.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <windows.h>
diff --git a/launcher/windows/src/Launcher.h b/launcher/windows/src/Launcher.h
index 12b9ec7..b3d827f 100644
--- a/launcher/windows/src/Launcher.h
+++ b/launcher/windows/src/Launcher.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _Launcher_H
diff --git a/launcher/windows/src/Main.c b/launcher/windows/src/Main.c
index a9519bc..dbb3c5d 100644
--- a/launcher/windows/src/Main.c
+++ b/launcher/windows/src/Main.c
@@ -1,40 +1,20 @@
-/*
- * 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):
+/**
+ * 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
  *
- * 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.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <windows.h>
diff --git a/launcher/windows/src/Main.h b/launcher/windows/src/Main.h
index 445227e..bfe0ee1 100644
--- a/launcher/windows/src/Main.h
+++ b/launcher/windows/src/Main.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _Main_H
diff --git a/launcher/windows/src/ProcessUtils.c b/launcher/windows/src/ProcessUtils.c
index 458ce00..9abab4c 100644
--- a/launcher/windows/src/ProcessUtils.c
+++ b/launcher/windows/src/ProcessUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "ProcessUtils.h"
diff --git a/launcher/windows/src/ProcessUtils.h b/launcher/windows/src/ProcessUtils.h
index df4c9f1..cc5859b 100644
--- a/launcher/windows/src/ProcessUtils.h
+++ b/launcher/windows/src/ProcessUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _ProcessUtils_H
diff --git a/launcher/windows/src/RegistryUtils.c b/launcher/windows/src/RegistryUtils.c
index 8c3534b..e7d537d 100644
--- a/launcher/windows/src/RegistryUtils.c
+++ b/launcher/windows/src/RegistryUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "RegistryUtils.h"
diff --git a/launcher/windows/src/RegistryUtils.h b/launcher/windows/src/RegistryUtils.h
index d6b40ae..4ca8db4 100644
--- a/launcher/windows/src/RegistryUtils.h
+++ b/launcher/windows/src/RegistryUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _RegistryUtils_H
diff --git a/launcher/windows/src/StringUtils.c b/launcher/windows/src/StringUtils.c
index 1360ef4..306d9bd 100644
--- a/launcher/windows/src/StringUtils.c
+++ b/launcher/windows/src/StringUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <wchar.h>
diff --git a/launcher/windows/src/StringUtils.h b/launcher/windows/src/StringUtils.h
index b822e9c..ecf0938 100644
--- a/launcher/windows/src/StringUtils.h
+++ b/launcher/windows/src/StringUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _StringUtils_H
diff --git a/launcher/windows/src/SystemUtils.c b/launcher/windows/src/SystemUtils.c
index 1e67ee0..41f0dbf 100644
--- a/launcher/windows/src/SystemUtils.c
+++ b/launcher/windows/src/SystemUtils.c
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include <windows.h>
diff --git a/launcher/windows/src/SystemUtils.h b/launcher/windows/src/SystemUtils.h
index 55f7df2..f375398 100644
--- a/launcher/windows/src/SystemUtils.h
+++ b/launcher/windows/src/SystemUtils.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _SystemUtils_H
diff --git a/launcher/windows/src/Types.h b/launcher/windows/src/Types.h
index 5b3b7b8..379bff6 100644
--- a/launcher/windows/src/Types.h
+++ b/launcher/windows/src/Types.h
@@ -1,40 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU General
- * Public License Version 2 only ("GPL") or the Common Development and Distribution
- * License("CDDL") (collectively, the "License"). You may not use this file except in
- * compliance with the License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
- * License for the specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header Notice in
- * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
- * designates this particular file as subject to the "Classpath" exception as
- * provided by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License Header,
- * with the fields enclosed by brackets [] replaced by your own identifying
- * information: "Portions Copyrighted [year] [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * The Original Software is NetBeans. The Initial Developer of the Original Software
- * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
- * Rights Reserved.
- * 
- * If you wish your version of this file to be governed by only the CDDL or only the
- * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
- * this software in this distribution under the [CDDL or GPL Version 2] license." If
- * you do not indicate a single choice of license, a recipient has the option to
- * distribute your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above. However, if
- * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
- * the option applies only if the new code is made subject to such option by the
- * copyright holder.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef _Types_H


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists