[netbeans] branch cnd updated: [NETBEANS-4619][CND] Missing license headers (#2858)

vieiro Tue, 06 Apr 2021 10:47:02 -0700

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

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



The following commit(s) were added to refs/heads/cnd by this push:
     new 792dabe  [NETBEANS-4619][CND] Missing license headers (#2858)
792dabe is described below

commit 792dabe91e846bf63be0de8c264586b13d43bf82
Author: Antonio Vieiro <[email protected]>
AuthorDate: Tue Apr 6 19:46:34 2021 +0200

    [NETBEANS-4619][CND] Missing license headers (#2858)
    
    * [NETBEANS-4619][CND] Missing license headers
    * [NETBEANS-4619][CND] Licensing improvements as per PR
---
 .../cnd/apt/impl/support/aptBigIntegerExpr.g       | 64 +++++----------
 .../modules/cnd/apt/impl/support/aptexpr.g         | 62 +++++----------
 .../modules/cnd/apt/impl/support/aptlexer.g        | 62 +++++----------
 cnd/cnd.asm/licenseinfo.xml                        | 31 ++++++++
 .../modules/cnd/asm/base/AntlrTokenTypes.txt       | 19 ++++-
 .../templates/cpp/cppunitrunner-cc.template        | 20 +++++
 .../templates/cpp/cppunittest-cc.template          | 20 +++++
 .../cncppunit/templates/cpp/cppunittest-h.template | 20 +++++
 .../cnd/cncppunit/templates/cpp/cppunittest.group  | 17 ++++
 .../cpp/test-cppunit-class-file-cpp.template       | 20 +++++
 .../cpp/test-cppunit-class-file-h.template         | 20 +++++
 .../cpp/test-cppunit-runner-file-cpp.template      | 20 +++++
 .../cnd/completion/templates/Bundle.properties     | 49 ++++--------
 .../debugger/common2/utils/ProcessListSupport.java | 18 ++++-
 .../modules/cnd/discovery/wizard/Bundle.properties | 16 ++++
 .../nbproject/Makefile-Linux-sparc_64.mk           | 17 ++++
 .../BuildTrace/nbproject/Makefile-Linux-x86.mk     | 17 ++++
 .../BuildTrace/nbproject/Makefile-Linux-x86_64.mk  | 17 ++++
 .../BuildTrace/nbproject/Makefile-MacOSX-x86.mk    | 17 ++++
 .../BuildTrace/nbproject/Makefile-MacOSX-x86_64.mk | 17 ++++
 .../BuildTrace/nbproject/Makefile-SunOS-Previse.mk | 17 ++++
 .../nbproject/Makefile-SunOS-Previse_64.mk         | 17 ++++
 .../BuildTrace/nbproject/Makefile-SunOS-sparc.mk   | 17 ++++
 .../nbproject/Makefile-SunOS-sparc_64.mk           | 17 ++++
 .../BuildTrace/nbproject/Makefile-SunOS-x86.mk     | 17 ++++
 .../BuildTrace/nbproject/Makefile-SunOS-x86_64.mk  | 17 ++++
 .../tools/BuildTrace/nbproject/Makefile-impl.mk    | 17 ++++
 .../BuildTrace/nbproject/Makefile-variables.mk     | 17 ++++
 .../nbproject/Package-Linux-sparc_64.bash          | 18 +++++
 .../BuildTrace/nbproject/Package-Linux-x86.bash    | 17 ++++
 .../BuildTrace/nbproject/Package-Linux-x86_64.bash | 17 ++++
 .../BuildTrace/nbproject/Package-MacOSX-x86.bash   | 17 ++++
 .../nbproject/Package-MacOSX-x86_64.bash           | 17 ++++
 .../nbproject/Package-SunOS-Previse.bash           | 17 ++++
 .../nbproject/Package-SunOS-Previse_64.bash        | 17 ++++
 .../BuildTrace/nbproject/Package-SunOS-sparc.bash  | 17 ++++
 .../nbproject/Package-SunOS-sparc_64.bash          | 17 ++++
 .../BuildTrace/nbproject/Package-SunOS-x86.bash    | 17 ++++
 .../BuildTrace/nbproject/Package-SunOS-x86_64.bash | 17 ++++
 cnd/cnd.discovery/tools/BuildTrace/test.awk        | 16 ++++
 cnd/cnd.discovery/tools/ToolsWrapperUnix/wrapper   | 18 +++++
 .../nbproject/Makefile-Unix_64.mk                  | 17 ++++
 .../nbproject/Makefile-Windows_32.mk               | 17 ++++
 .../ToolsWrapperWidows/nbproject/Makefile-impl.mk  | 17 ++++
 .../nbproject/Makefile-variables.mk                | 17 ++++
 .../nbproject/Package-Unix_64.bash                 | 17 ++++
 .../nbproject/Package-Windows_32.bash              | 17 ++++
 cnd/cnd.editor/l10n.list                           | 17 ++++
 cnd/cnd.editor/licenseinfo.xml                     | 32 ++++++++
 cnd/cnd.kit/hudson/master-email.template           | 20 +++++
 cnd/cnd.kit/hudson/reporter.template               | 20 +++++
 cnd/cnd.kit/hudson/slave-email.template            | 20 +++++
 cnd/cnd.kit/hudson/unstable.template               | 20 +++++
 cnd/cnd.kit/release/VERSION.txt                    | 17 ++++
 cnd/cnd.makeproject/licenseinfo.xml                | 31 ++++++++
 .../launchers/resources/simple-launcher.template   | 17 ++++
 .../cnd/makeproject/resources/MasterMakefile       | 17 ++++
 .../makeproject/resources/MasterMakefile-impl.mk   | 17 ++++
 cnd/cnd.modelimpl/external/binaries-list           | 19 ++++-
 .../modules/cnd/modelimpl/csm/DeclTypeImpl.java    | 50 ++++--------
 .../cnd/navigation/resources/cnd_navigation.wsmode | 19 +++++
 cnd/cnd.remote/licenseinfo.xml                     | 31 ++++++++
 .../tools/nbproject/Package-Test_filedata_32.bash  | 17 ++++
 cnd/cnd.remote/tools/test/test1.sh                 | 49 ++++--------
 cnd/cnd.remote/tools/todo.txt                      |  2 +
 cnd/cnd.script/licenseinfo.xml                     | 32 ++++++++
 cnd/cnd.simpleunit/licenseinfo.xml                 | 32 ++++++++
 .../cnd/toolchain/api/toolchaindefinition.xsd      | 22 +++++-
 cnd/cnd.ui/licenseinfo.xml                         | 35 +++++++++
 .../cnd/resources/templates/c/empty-c.template     | 20 +++++
 .../resources/templates/c/file_header-c.template   | 20 +++++
 .../resources/templates/c/file_header-h.template   | 20 +++++
 .../cnd/resources/templates/c/file_header.group    | 17 ++++
 .../cnd/resources/templates/c/simple-c.template    | 20 +++++
 .../cnd/resources/templates/c/simple-h.template    | 20 +++++
 .../cnd/resources/templates/cpp/class-cc.template  | 20 +++++
 .../cnd/resources/templates/cpp/class-h.template   | 20 +++++
 .../cnd/resources/templates/cpp/class.group        | 17 ++++
 .../cnd/resources/templates/cpp/empty-cc.template  | 20 +++++
 .../templates/cpp/file_header-cc.template          | 20 +++++
 .../resources/templates/cpp/file_header-h.template | 20 +++++
 .../cnd/resources/templates/cpp/file_header.group  | 17 ++++
 .../cnd/resources/templates/cpp/header-h.template  | 20 +++++
 .../cnd/resources/templates/cpp/header.template    | 20 +++++
 .../cnd/resources/templates/cpp/simple-cc.template | 20 +++++
 .../resources/templates/fortran/empty-f90.template | 20 +++++
 .../templates/fortran/fixed-fortran-f.template     | 20 +++++
 .../templates/fortran/free-fortran-f90.template    | 20 +++++
 .../templates/fortran/module-f90.template          | 20 +++++
 .../cnd/resources/templates/qt/form-cc.template    | 20 +++++
 .../cnd/resources/templates/qt/form-h.template     | 20 +++++
 .../cnd/resources/templates/qt/simple-cc.template  | 20 +++++
 .../org/netbeans/modules/cnd/help/credits.html     | 91 +++++++++-------------
 .../org/netbeans/modules/cnd/help/stopwords.swd    | 17 ++++
 cnd/cnd/l10n.list                                  | 16 ++++
 cnd/libs.clank/external/binaries-list              | 18 +++++
 .../external/create_project_properties.sh          | 16 ++++
 97 files changed, 1852 insertions(+), 296 deletions(-)

diff --git 
a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptBigIntegerExpr.g 
b/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptBigIntegerExpr.g
index f1038fb..25935d8 100644
--- 
a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptBigIntegerExpr.g
+++ 
b/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptBigIntegerExpr.g
@@ -1,47 +1,21 @@
-//
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-//
-// Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-//
-// Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-// Other names may be trademarks of their respective owners.
-//
-// The contents of this file are subject to the terms of either the GNU
-// General Public License Version 2 only ("GPL") or the Common
-// Development and Distribution License("CDDL") (collectively, the
-// "License"). You may not use this file except in compliance with the
-// License. You can obtain a copy of the License at
-// http://www.netbeans.org/cddl-gplv2.html
-// or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-// specific language governing permissions and limitations under the
-// License.  When distributing the software, include this License Header
-// Notice in each file and include the License file at
-// nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-// particular file as subject to the "Classpath" exception as provided
-// by Oracle in the GPL Version 2 section of the License file that
-// accompanied this code. If applicable, add the following below the
-// License Header, with the fields enclosed by brackets [] replaced by
-// your own identifying information:
-// "Portions Copyrighted [year] [name of copyright owner]"
-//
-// Contributor(s):
-//
-// The Original Software is NetBeans. The Initial Developer of the Original
-// Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-// Microsystems, Inc. All Rights Reserved.
-//
-// 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.
-//
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  *
  * Parser for preprocessor expressions based on Big Integers
@@ -312,4 +286,4 @@ ud_constant_value returns [BigInteger r] 
{r=BigInteger.ZERO;}
         | b:BINARYINT {r=binaryToBigInteger(b.getText());}
         | c:CHAR_LITERAL {r=charToBigInteger(c.getText()); }
     )
-    ;
\ No newline at end of file
+    ;
diff --git 
a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptexpr.g 
b/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptexpr.g
index 39aa54d..0843c12 100644
--- a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptexpr.g
+++ b/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptexpr.g
@@ -1,47 +1,21 @@
-//
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-//
-// Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-//
-// Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-// Other names may be trademarks of their respective owners.
-//
-// The contents of this file are subject to the terms of either the GNU
-// General Public License Version 2 only ("GPL") or the Common
-// Development and Distribution License("CDDL") (collectively, the
-// "License"). You may not use this file except in compliance with the
-// License. You can obtain a copy of the License at
-// http://www.netbeans.org/cddl-gplv2.html
-// or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-// specific language governing permissions and limitations under the
-// License.  When distributing the software, include this License Header
-// Notice in each file and include the License file at
-// nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-// particular file as subject to the "Classpath" exception as provided
-// by Oracle in the GPL Version 2 section of the License file that
-// accompanied this code. If applicable, add the following below the
-// License Header, with the fields enclosed by brackets [] replaced by
-// your own identifying information:
-// "Portions Copyrighted [year] [name of copyright owner]"
-//
-// Contributor(s):
-//
-// The Original Software is NetBeans. The Initial Developer of the Original
-// Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-// Microsystems, Inc. All Rights Reserved.
-//
-// 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.
-//
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 /*
  *
  * Parser for preprocessor expressions
diff --git 
a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptlexer.g 
b/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptlexer.g
index 413ccbf..8e2dde3 100644
--- a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptlexer.g
+++ b/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptlexer.g
@@ -1,47 +1,21 @@
-//
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-//
-// Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-//
-// Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-// Other names may be trademarks of their respective owners.
-//
-// The contents of this file are subject to the terms of either the GNU
-// General Public License Version 2 only ("GPL") or the Common
-// Development and Distribution License("CDDL") (collectively, the
-// "License"). You may not use this file except in compliance with the
-// License. You can obtain a copy of the License at
-// http://www.netbeans.org/cddl-gplv2.html
-// or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-// specific language governing permissions and limitations under the
-// License.  When distributing the software, include this License Header
-// Notice in each file and include the License file at
-// nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-// particular file as subject to the "Classpath" exception as provided
-// by Oracle in the GPL Version 2 section of the License file that
-// accompanied this code. If applicable, add the following below the
-// License Header, with the fields enclosed by brackets [] replaced by
-// your own identifying information:
-// "Portions Copyrighted [year] [name of copyright owner]"
-//
-// Contributor(s):
-//
-// The Original Software is NetBeans. The Initial Developer of the Original
-// Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
-// Microsystems, Inc. All Rights Reserved.
-//
-// 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.
-//
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 // Start of APTLexer.cpp block
 header {
 
diff --git a/cnd/cnd.asm/licenseinfo.xml b/cnd/cnd.asm/licenseinfo.xml
new file mode 100644
index 0000000..c17efdb
--- /dev/null
+++ b/cnd/cnd.asm/licenseinfo.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<licenseinfo>
+    <fileset>
+        <!-- User templates -->
+        
<file>src/org/netbeans/modules/cnd/asm/core/resources/AsmExample.s</file>
+        
<file>src/org/netbeans/modules/cnd/asm/core/resources/AsmTemplate.s</file>
+        
<file>src/org/netbeans/modules/cnd/asm/core/resources/InlineTemplate.il</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="COMMENT_UNSUPPORTED" />
+    </fileset>
+</licenseinfo>
diff --git 
a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/AntlrTokenTypes.txt 
b/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/AntlrTokenTypes.txt
index bac6d82..65d1367 100644
--- a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/AntlrTokenTypes.txt
+++ b/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/AntlrTokenTypes.txt
@@ -1,3 +1,20 @@
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements.  See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership.  The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied.  See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+
 DisScanner   
 LabelInst=4
 DigitLabel=5
@@ -46,4 +63,4 @@ IncompleteCComment=47
 CComment=48
 Comment=49
 Ident=50
-Register=51
\ No newline at end of file
+Register=51
diff --git 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunitrunner-cc.template
 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunitrunner-cc.template
index 1b9f34c..ca93d87 100644
--- 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunitrunner-cc.template
+++ 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunitrunner-cc.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-cc.template
 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-cc.template
index 443f017..491b51a 100644
--- 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-cc.template
+++ 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-cc.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-h.template
 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-h.template
index 59915c6..753e9f1 100644
--- 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-h.template
+++ 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-h.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest.group
 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest.group
index b9e81ce..ec90ee9 100644
--- 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest.group
+++ 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest.group
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   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.
+
 Templates/cppFiles/__cppunittest__.h
 Templates/cppFiles/__cppunittest__.cc
diff --git 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-cpp.template
 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-cpp.template
index 0ecff53..3d87fb1 100644
--- 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-cpp.template
+++ 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-cpp.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-h.template
 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-h.template
index 9541703..58593ec 100644
--- 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-h.template
+++ 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-h.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-runner-file-cpp.template
 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-runner-file-cpp.template
index bd70103..27d551a 100644
--- 
a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-runner-file-cpp.template
+++ 
b/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-runner-file-cpp.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/Bundle.properties
 
b/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/Bundle.properties
index 8e9dfa2..1796d35 100644
--- 
a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/Bundle.properties
+++ 
b/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/Bundle.properties
@@ -1,39 +1,18 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 #JavaCodeTemplateProcessor
 CPP-init=Initializing code templates...
diff --git 
a/cnd/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/utils/ProcessListSupport.java
 
b/cnd/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/utils/ProcessListSupport.java
index b9f2eab..1edf442 100644
--- 
a/cnd/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/utils/ProcessListSupport.java
+++ 
b/cnd/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/utils/ProcessListSupport.java
@@ -1,6 +1,22 @@
 /*
- * Copyright (c) 2009, 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
+ *
+ *   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.
  */
+
 package org.netbeans.modules.cnd.debugger.common2.utils;
 
 
diff --git 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties
 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties
index aa17c6b..ff5d4c1 100644
--- 
a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties
+++ 
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/wizard/Bundle.properties
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   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.
 
 WIZARD_TITLE_TXT=Configure Code Assistance Wizard
 ACTION_TITLE_TXT=Configure Code Assistance...
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-sparc_64.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-sparc_64.mk
index 62db4f3..02ee23d 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-sparc_64.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-sparc_64.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-x86.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-x86.mk
index c9c60d3..9b6bd03 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-x86.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-x86.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-x86_64.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-x86_64.mk
index 67a8ae0..ab3f49f 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-x86_64.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-Linux-x86_64.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-MacOSX-x86.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-MacOSX-x86.mk
index 9af17f0..bbaf34c 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-MacOSX-x86.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-MacOSX-x86.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-MacOSX-x86_64.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-MacOSX-x86_64.mk
index 900b227..2952f25 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-MacOSX-x86_64.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-MacOSX-x86_64.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-Previse.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-Previse.mk
index a3499e3..4096d06 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-Previse.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-Previse.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-Previse_64.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-Previse_64.mk
index 3be4f9c..4d6b9d0 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-Previse_64.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-Previse_64.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-sparc.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-sparc.mk
index c6ca83d..121fd95 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-sparc.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-sparc.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-sparc_64.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-sparc_64.mk
index 467da07..19117a3 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-sparc_64.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-sparc_64.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-x86.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-x86.mk
index cf669f0..1241bf7 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-x86.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-x86.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-x86_64.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-x86_64.mk
index 35fe0b8..cbbacb4 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-x86_64.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-SunOS-x86_64.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-impl.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-impl.mk
index 7e315b8..32c22b4 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-impl.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-impl.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # 
 # Generated Makefile - do not edit! 
 # 
diff --git a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-variables.mk 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-variables.mk
index f768a34..e24eb2e 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-variables.mk
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Makefile-variables.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-sparc_64.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-sparc_64.bash
index 9ad20b2..18c1488 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-sparc_64.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-sparc_64.bash
@@ -1,4 +1,22 @@
 #!/bin/bash -x
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-x86.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-x86.bash
index 5a99e13..af7b1de 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-x86.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-x86.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-x86_64.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-x86_64.bash
index 59c2504..b3fc1da 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-x86_64.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-Linux-x86_64.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-MacOSX-x86.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-MacOSX-x86.bash
index d8445eb..25a3a6e 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-MacOSX-x86.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-MacOSX-x86.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-MacOSX-x86_64.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-MacOSX-x86_64.bash
index 031b5ea..3f2012b 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-MacOSX-x86_64.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-MacOSX-x86_64.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-Previse.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-Previse.bash
index d00440a..a91cb3e 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-Previse.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-Previse.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-Previse_64.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-Previse_64.bash
index 46eddaa..e1826bf 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-Previse_64.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-Previse_64.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-sparc.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-sparc.bash
index 0b6565e..4820400 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-sparc.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-sparc.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-sparc_64.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-sparc_64.bash
index 14bdefb..8cbe008 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-sparc_64.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-sparc_64.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-x86.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-x86.bash
index 7a4fcdb..d6676fd 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-x86.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-x86.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-x86_64.bash 
b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-x86_64.bash
index 7d93640..0abb12a 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-x86_64.bash
+++ b/cnd/cnd.discovery/tools/BuildTrace/nbproject/Package-SunOS-x86_64.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git a/cnd/cnd.discovery/tools/BuildTrace/test.awk 
b/cnd/cnd.discovery/tools/BuildTrace/test.awk
index 8f5d2cc..9b8064d 100644
--- a/cnd/cnd.discovery/tools/BuildTrace/test.awk
+++ b/cnd/cnd.discovery/tools/BuildTrace/test.awk
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   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.
 
 BEGIN {
     R["called:"]=0; 
diff --git a/cnd/cnd.discovery/tools/ToolsWrapperUnix/wrapper 
b/cnd/cnd.discovery/tools/ToolsWrapperUnix/wrapper
index a3b59a4..7345b17 100755
--- a/cnd/cnd.discovery/tools/ToolsWrapperUnix/wrapper
+++ b/cnd/cnd.discovery/tools/ToolsWrapperUnix/wrapper
@@ -1,4 +1,22 @@
 #!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
 #set -x
 real_tool=echo
 if [ -n "${__CND_BUILD_LOG__}" ]; then
diff --git 
a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-Unix_64.mk 
b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-Unix_64.mk
index 703b4c9..efe2b7c 100644
--- a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-Unix_64.mk
+++ b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-Unix_64.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-Windows_32.mk 
b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-Windows_32.mk
index fcd1f74..c1204eb 100644
--- 
a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-Windows_32.mk
+++ 
b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-Windows_32.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated Makefile - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-impl.mk 
b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-impl.mk
index 01a18ab..1b3bfe7 100644
--- a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-impl.mk
+++ b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-impl.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # 
 # Generated Makefile - do not edit! 
 # 
diff --git 
a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-variables.mk 
b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-variables.mk
index 5b4e5c3..bdfb16e 100644
--- a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-variables.mk
+++ b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Makefile-variables.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 # Generated - do not edit!
 #
diff --git 
a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Package-Unix_64.bash 
b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Package-Unix_64.bash
index e05d85b..33717d9 100644
--- a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Package-Unix_64.bash
+++ b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Package-Unix_64.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git 
a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Package-Windows_32.bash 
b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Package-Windows_32.bash
index afc3c70..c2d8997 100644
--- 
a/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Package-Windows_32.bash
+++ 
b/cnd/cnd.discovery/tools/ToolsWrapperWidows/nbproject/Package-Windows_32.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git a/cnd/cnd.editor/l10n.list b/cnd/cnd.editor/l10n.list
index 67802d8..3377d55 100644
--- a/cnd/cnd.editor/l10n.list
+++ b/cnd/cnd.editor/l10n.list
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 # C/C++ Editor
 read global
 ${l10n-module}/src/**/*.gif
diff --git a/cnd/cnd.editor/licenseinfo.xml b/cnd/cnd.editor/licenseinfo.xml
new file mode 100644
index 0000000..6592824
--- /dev/null
+++ b/cnd/cnd.editor/licenseinfo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<licenseinfo>
+    <fileset>
+        <!-- User templates -->
+        
<file>src/org/netbeans/modules/cnd/editor/resources/cplusplus/CCExample</file>
+        
<file>src/org/netbeans/modules/cnd/editor/resources/cplusplus/CExample</file>
+        
<file>src/org/netbeans/modules/cnd/editor/resources/cplusplus/HExample</file>
+        
<file>src/org/netbeans/modules/cnd/editor/resources/fortran/FExample</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="GUI_USABILITY" />
+    </fileset>
+</licenseinfo>
diff --git a/cnd/cnd.kit/hudson/master-email.template 
b/cnd/cnd.kit/hudson/master-email.template
index de4e496..48f66db 100644
--- a/cnd/cnd.kit/hudson/master-email.template
+++ b/cnd/cnd.kit/hudson/master-email.template
@@ -1,4 +1,24 @@
 <html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <head>
 <title>Hudson build report</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/cnd/cnd.kit/hudson/reporter.template 
b/cnd/cnd.kit/hudson/reporter.template
index a6e9dcf..f23ac33 100644
--- a/cnd/cnd.kit/hudson/reporter.template
+++ b/cnd/cnd.kit/hudson/reporter.template
@@ -1,4 +1,24 @@
 <html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <head>
 <title>Hudson test report</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/cnd/cnd.kit/hudson/slave-email.template 
b/cnd/cnd.kit/hudson/slave-email.template
index ca89f0b..047bf16 100644
--- a/cnd/cnd.kit/hudson/slave-email.template
+++ b/cnd/cnd.kit/hudson/slave-email.template
@@ -1,4 +1,24 @@
 <html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <head>
 <title>Hudson build report</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/cnd/cnd.kit/hudson/unstable.template 
b/cnd/cnd.kit/hudson/unstable.template
index aefae11..f6a999c 100644
--- a/cnd/cnd.kit/hudson/unstable.template
+++ b/cnd/cnd.kit/hudson/unstable.template
@@ -1,4 +1,24 @@
 <html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <head>
 <title>Unstable tests report</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/cnd/cnd.kit/release/VERSION.txt b/cnd/cnd.kit/release/VERSION.txt
index f792293..a940241 100644
--- a/cnd/cnd.kit/release/VERSION.txt
+++ b/cnd/cnd.kit/release/VERSION.txt
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   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.
+
 # cluster incompatible release version
 13
diff --git a/cnd/cnd.makeproject/licenseinfo.xml 
b/cnd/cnd.makeproject/licenseinfo.xml
new file mode 100644
index 0000000..b78003a
--- /dev/null
+++ b/cnd/cnd.makeproject/licenseinfo.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<licenseinfo>
+    <fileset>
+        <!-- User templates -->
+        <file>samples_src/hellocmake/CMakeLists.txt</file>
+        <file>samples_src/hellocmake/src/CMakeLists.txt</file>
+        <file>samples_src/helloqt/HelloForm.ui</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="TEMPLATE_MINIMAL_IP" />
+    </fileset>
+</licenseinfo>
diff --git 
a/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/launchers/resources/simple-launcher.template
 
b/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/launchers/resources/simple-launcher.template
index 3edc2d8..5d4d887 100644
--- 
a/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/launchers/resources/simple-launcher.template
+++ 
b/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/launchers/resources/simple-launcher.template
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 # Launchers File syntax:
 #
 # [Must-have property line] 
diff --git 
a/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/resources/MasterMakefile
 
b/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/resources/MasterMakefile
index 05de621..4dda6db 100644
--- 
a/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/resources/MasterMakefile
+++ 
b/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/resources/MasterMakefile
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 #
 #  There exist several targets which are by default empty and which can be 
 #  used for execution of your targets. These targets are usually executed 
diff --git 
a/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/resources/MasterMakefile-impl.mk
 
b/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/resources/MasterMakefile-impl.mk
index 18dca3f..74640e1 100644
--- 
a/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/resources/MasterMakefile-impl.mk
+++ 
b/cnd/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/resources/MasterMakefile-impl.mk
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # 
 # Generated Makefile - do not edit! 
 # 
diff --git a/cnd/cnd.modelimpl/external/binaries-list 
b/cnd/cnd.modelimpl/external/binaries-list
index cc2a892..de3818c 100644
--- a/cnd/cnd.modelimpl/external/binaries-list
+++ b/cnd/cnd.modelimpl/external/binaries-list
@@ -1 +1,18 @@
-C51780D99464CBF45B0495C7646B442AB3C7B463 open-fortran-parser-0.7.1.2.zip
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+C51780D99464CBF45B0495C7646B442AB3C7B463 open-fortran-parser-0.7.1.2.zip
diff --git 
a/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/DeclTypeImpl.java
 
b/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/DeclTypeImpl.java
index ac120d6..81f3813 100644
--- 
a/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/DeclTypeImpl.java
+++ 
b/cnd/cnd.modelimpl/src/org/netbeans/modules/cnd/modelimpl/csm/DeclTypeImpl.java
@@ -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 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]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a * 
single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ * 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.
  */
 package org.netbeans.modules.cnd.modelimpl.csm;
 
diff --git 
a/cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/resources/cnd_navigation.wsmode
 
b/cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/resources/cnd_navigation.wsmode
index 35e0a23..7521285 100644
--- 
a/cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/resources/cnd_navigation.wsmode
+++ 
b/cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/resources/cnd_navigation.wsmode
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
 
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <!DOCTYPE mode PUBLIC
           "-//NetBeans//DTD Mode Properties 2.0//EN"
           "http://www.netbeans.org/dtds/mode-properties2_0.dtd";>
diff --git a/cnd/cnd.remote/licenseinfo.xml b/cnd/cnd.remote/licenseinfo.xml
new file mode 100644
index 0000000..59254ef
--- /dev/null
+++ b/cnd/cnd.remote/licenseinfo.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<licenseinfo>
+    <fileset>
+        <!-- User templates -->
+        <file>tools/test/file_1</file>
+        <file>tools/test/file_2</file>
+        <file>tools/test/subdir/sub_1</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="TEMPLATE_MINIMAL_IP" />
+    </fileset>
+</licenseinfo>
diff --git a/cnd/cnd.remote/tools/nbproject/Package-Test_filedata_32.bash 
b/cnd/cnd.remote/tools/nbproject/Package-Test_filedata_32.bash
index f0a5e7a..99172c8 100644
--- a/cnd/cnd.remote/tools/nbproject/Package-Test_filedata_32.bash
+++ b/cnd/cnd.remote/tools/nbproject/Package-Test_filedata_32.bash
@@ -1,4 +1,21 @@
 #!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 
 #
 # Generated - do not edit!
diff --git a/cnd/cnd.remote/tools/test/test1.sh 
b/cnd/cnd.remote/tools/test/test1.sh
index 12ab792..9102d84 100755
--- a/cnd/cnd.remote/tools/test/test1.sh
+++ b/cnd/cnd.remote/tools/test/test1.sh
@@ -1,41 +1,20 @@
 #/bin/sh -x
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 echo "### absolute"
 cat `pwd`/test/file_1
diff --git a/cnd/cnd.remote/tools/todo.txt b/cnd/cnd.remote/tools/todo.txt
index 80dc204..0b128c2 100644
--- a/cnd/cnd.remote/tools/todo.txt
+++ b/cnd/cnd.remote/tools/todo.txt
@@ -1,3 +1,5 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor 
license agreements; and to You under the Apache License, Version 2.0. "
+
 TODO:
 
 - pass directory structure to the remote controller
diff --git a/cnd/cnd.script/licenseinfo.xml b/cnd/cnd.script/licenseinfo.xml
new file mode 100644
index 0000000..b556a05
--- /dev/null
+++ b/cnd/cnd.script/licenseinfo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<licenseinfo>
+    <fileset>
+        <!-- User templates -->
+        
<file>src/org/netbeans/modules/cnd/script/resources/batExample.bat</file>
+        
<file>src/org/netbeans/modules/cnd/script/resources/makefileExample</file>
+        
<file>src/org/netbeans/modules/cnd/script/resources/shellExample.sh</file>
+        
<file>src/org/netbeans/modules/cnd/script/resources/simple-shell.template</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="TEMPLATE_MINIMAL_IP" />
+    </fileset>
+</licenseinfo>
diff --git a/cnd/cnd.simpleunit/licenseinfo.xml 
b/cnd/cnd.simpleunit/licenseinfo.xml
new file mode 100644
index 0000000..a4cb322
--- /dev/null
+++ b/cnd/cnd.simpleunit/licenseinfo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<licenseinfo>
+    <fileset>
+        <!-- User templates -->
+        
<file>src/org/netbeans/modules/cnd/simpleunit/templates/cpp/simple-test-cc.template</file>
+        
<file>src/org/netbeans/modules/cnd/simpleunit/templates/cpp/test-simple-file-cpp.template</file>
+        
<file>src/org/netbeans/modules/cnd/simpleunit/templates/c/simple-test-c.template</file>
+        
<file>src/org/netbeans/modules/cnd/simpleunit/templates/c/test-simple-file-c.template</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="TEMPLATE_MINIMAL_IP" />
+    </fileset>
+</licenseinfo>
diff --git 
a/cnd/cnd.toolchain/test/unit/src/org/netbeans/modules/cnd/toolchain/api/toolchaindefinition.xsd
 
b/cnd/cnd.toolchain/test/unit/src/org/netbeans/modules/cnd/toolchain/api/toolchaindefinition.xsd
index 353cd95..9c3c65b 100644
--- 
a/cnd/cnd.toolchain/test/unit/src/org/netbeans/modules/cnd/toolchain/api/toolchaindefinition.xsd
+++ 
b/cnd/cnd.toolchain/test/unit/src/org/netbeans/modules/cnd/toolchain/api/toolchaindefinition.xsd
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
            xmlns:tns="http://www.netbeans.org/ns/cnd-toolchain-definition/1";
            
targetNamespace="http://www.netbeans.org/ns/cnd-toolchain-definition/1";
@@ -834,4 +854,4 @@
         </xs:complexType>
     </xs:element>
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/cnd/cnd.ui/licenseinfo.xml b/cnd/cnd.ui/licenseinfo.xml
new file mode 100644
index 0000000..8d3c61c
--- /dev/null
+++ b/cnd/cnd.ui/licenseinfo.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<licenseinfo>
+    <fileset>
+        <!-- User templates -->
+        
<file>src/org/netbeans/modules/cnd/resources/templates/qt/widget.template</file>
+        
<file>src/org/netbeans/modules/cnd/resources/templates/qt/dialog-buttonsright.template</file>
+        
<file>src/org/netbeans/modules/cnd/resources/templates/qt/resource.template</file>
+        
<file>src/org/netbeans/modules/cnd/resources/templates/qt/translation.template</file>
+        
<file>src/org/netbeans/modules/cnd/resources/templates/qt/dialog-buttonsbottom.template</file>
+        
<file>src/org/netbeans/modules/cnd/resources/templates/qt/mainwindow.template</file>
+        
<file>src/org/netbeans/modules/cnd/resources/templates/qt/dialog-nobuttons.template</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="GUI_USABILITY" />
+    </fileset>
+</licenseinfo>
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/empty-c.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/empty-c.template
index ce2708f..b3859db 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/empty-c.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/empty-c.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header-c.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header-c.template
index fb84ff5..704611d 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header-c.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header-c.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header-h.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header-h.template
index 5baaccf..cf717d2 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header-h.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header-h.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header.group
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header.group
index 6ef87aa..f840778 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header.group
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/file_header.group
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   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.
+
 Templates/cFiles/__file_header__.h
 Templates/cFiles/__file_header__.c
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/simple-c.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/simple-c.template
index 48583d4..8f90c4f 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/simple-c.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/simple-c.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/simple-h.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/simple-h.template
index 7462f11..6c2363f 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/simple-h.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/c/simple-h.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class-cc.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class-cc.template
index 95ba5cc..7feac32 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class-cc.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class-cc.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class-h.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class-h.template
index cd7664f..d6882cb 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class-h.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class-h.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class.group 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class.group
index 5d2fab0..8873b2b 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class.group
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/class.group
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   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.
+
 Templates/cppFiles/__class__.h
 Templates/cppFiles/__class__.cc
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/empty-cc.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/empty-cc.template
index ce2708f..b3859db 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/empty-cc.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/empty-cc.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header-cc.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header-cc.template
index fb84ff5..704611d 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header-cc.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header-cc.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header-h.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header-h.template
index 5baaccf..cf717d2 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header-h.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header-h.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header.group
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header.group
index b84b04d..4696abf 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header.group
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/file_header.group
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   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.
+
 Templates/cFiles/__file_header__.h
 Templates/cFiles/__file_header__.cc
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/header-h.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/header-h.template
index 8dadb9b..ad8b759 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/header-h.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/header-h.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/header.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/header.template
index a2dd910..79cca83 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/header.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/header.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 // -*- C++ -*-
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/simple-cc.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/simple-cc.template
index 6a7da8f..b614d9f 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/simple-cc.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/cpp/simple-cc.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/empty-f90.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/empty-f90.template
index 8b98812..0474aed 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/empty-f90.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/empty-f90.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "!">
 <#assign licensePrefix = "! ">
 <#assign licenseLast = "!">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/fixed-fortran-f.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/fixed-fortran-f.template
index 7d6d0bc..1b2039c 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/fixed-fortran-f.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/fixed-fortran-f.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "C">
 <#assign licensePrefix = "C ">
 <#assign licenseLast = "C">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/free-fortran-f90.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/free-fortran-f90.template
index 2d20ad6..920f451 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/free-fortran-f90.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/free-fortran-f90.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "!">
 <#assign licensePrefix = "! ">
 <#assign licenseLast = "!">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/module-f90.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/module-f90.template
index 37b93d4..3402faa 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/module-f90.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/fortran/module-f90.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "!">
 <#assign licensePrefix = "! ">
 <#assign licenseLast = "!">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/form-cc.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/form-cc.template
index f3b7b4d..f5fb14a 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/form-cc.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/form-cc.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/form-h.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/form-h.template
index 1faae9b..6868519 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/form-h.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/form-h.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/simple-cc.template
 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/simple-cc.template
index dbb243a..0e755ef 100644
--- 
a/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/simple-cc.template
+++ 
b/cnd/cnd.ui/src/org/netbeans/modules/cnd/resources/templates/qt/simple-cc.template
@@ -1,3 +1,23 @@
+<#--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
 <#assign licenseFirst = "/*">
 <#assign licensePrefix = " * ">
 <#assign licenseLast = " */">
diff --git a/cnd/cnd/javahelp/org/netbeans/modules/cnd/help/credits.html 
b/cnd/cnd/javahelp/org/netbeans/modules/cnd/help/credits.html
index f20c591..6316ce4 100755
--- a/cnd/cnd/javahelp/org/netbeans/modules/cnd/help/credits.html
+++ b/cnd/cnd/javahelp/org/netbeans/modules/cnd/help/credits.html
@@ -1,6 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <!--
-*     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
+
+      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.
+
 -->
 <html>
   <head>
@@ -12,57 +29,25 @@
     <title>Legal Notices</title>
   </head>
   <body>
-    <p>
-       DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-    </p>
-    <p>
-       Copyright © 1997, 2012, Oracle and/or its affiliates. All rights 
reserved.
-    </p>
-    <p>
-       Oracle and Java are registered trademarks of Oracle and/or its 
affiliates. Other names may
-      be trademarks of their respective owners.
-    </p>
-    <p>
-       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 <a href=
-      
"http://www.netbeans.org/cddl-gplv2.html";>http://www.netbeans.org/cddl-gplv2.html</a>
 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<br>
-       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:<br>
-       "Portions Copyrighted [year] [name of copyright owner]"
-    </p>
-    <p>
-       Contributor(s):
-    </p>
-    <p>
-       The original software is NetBeans. The initial developer of the 
original software was Sun
-      Microsystems, Inc.; portions copyright 1997-2006 Sun Microsystems, Inc. 
All rights reserved.
-    </p>
-    <p>
-       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<br>
-       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<br>
-       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<br>
-       Version 2 license, then the option applies only if the new code is made 
subject to such
-      option by the copyright holder.
-    </p>
-    <p>
-       Oracle is not responsible for the availability of third-party Web sites 
mentioned in this
-      document. Oracle does not endorse and is not responsible or liable for 
any content,
-      advertising, products, or other materials on or available from such 
sites or resources.
-      Oracle will not be responsible or liable for any damage or loss caused 
or alleged to be
-      caused by or in connection with use of or reliance on any such content, 
goods, or services
-      available on or through any such sites or resources.
-    </p>
+      <pre>
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+      </pre>
   </body>
 </html>
diff --git a/cnd/cnd/javahelp/org/netbeans/modules/cnd/help/stopwords.swd 
b/cnd/cnd/javahelp/org/netbeans/modules/cnd/help/stopwords.swd
index e69de29..2456923 100755
--- a/cnd/cnd/javahelp/org/netbeans/modules/cnd/help/stopwords.swd
+++ b/cnd/cnd/javahelp/org/netbeans/modules/cnd/help/stopwords.swd
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
diff --git a/cnd/cnd/l10n.list b/cnd/cnd/l10n.list
index 52718b9..30fb69c 100644
--- a/cnd/cnd/l10n.list
+++ b/cnd/cnd/l10n.list
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   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.
 # cnd/core
 read global
 ${l10n-module}/src/**/*.png
diff --git a/cnd/libs.clank/external/binaries-list 
b/cnd/libs.clank/external/binaries-list
index d49511e..1da1cea 100644
--- a/cnd/libs.clank/external/binaries-list
+++ b/cnd/libs.clank/external/binaries-list
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
 #changeset:   21704:717eaec19c30
 #branch:      jclank
 #tag:         tip
diff --git a/cnd/libs.clank/external/create_project_properties.sh 
b/cnd/libs.clank/external/create_project_properties.sh
index a0be120..c85997c 100755
--- a/cnd/libs.clank/external/create_project_properties.sh
+++ b/cnd/libs.clank/external/create_project_properties.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 function get_public_packages() {
     prj=$1

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

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

[netbeans] branch cnd updated: [NETBEANS-4619][CND] Missing license headers (#2858)

Reply via email to