This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch cnd
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/cnd by this push:
new 5cc62ab [NETBEANS-4744] - update RAT license exceptions
new d99a060 Merge pull request #2355 from BradWalker/cnd_update_RAT_report
5cc62ab is described below
commit 5cc62abe8b7a5cc89fbfc7ede234d6df720f5d56
Author: Brad Walker <bwal...@musings.com>
AuthorDate: Wed Aug 26 14:31:01 2020 -0600
[NETBEANS-4744] - update RAT license exceptions
Updated the copyright in the XML files.
Updated the copyright in the C,C++ files.
Updated the copyright in the .h files.
---
.../org/netbeans/modules/cnd/discovery/layer.xml | 1 -
.../samples_src/freeway/arrow_left.bitmap | 39 ++++++++------------
.../samples_src/freeway/arrow_over.bitmap | 39 ++++++++------------
.../samples_src/freeway/arrow_right.bitmap | 39 ++++++++------------
.../samples_src/freeway/arrow_up.bitmap | 39 ++++++++------------
.../samples_src/freeway/traffic.icon | 39 ++++++++------------
.../samples_src/freeway/traffic.mask | 39 ++++++++------------
cnd/cnd.makeproject/samples_src/hello/bar.f | 39 ++++++++------------
cnd/cnd.makeproject/samples_src/hello/foo.f | 40 ++++++++-------------
.../samples_src/helloqt/HelloForm.cpp | 39 ++++++++------------
.../samples_src/helloqt/newmain.cpp | 39 ++++++++------------
cnd/cnd.makeproject/samples_src/lexyacc/token.l | 39 ++++++++------------
cnd/cnd.makeproject/samples_src/lexyacc/token.y | 39 ++++++++------------
.../samples_src/sample.cookbook.txt | 41 ++++++++--------------
.../resources/toolchaindefinition/GNU_debugger.xml | 1 +
.../cnd.diagnostics.clank/nbproject/project.xml | 1 -
16 files changed, 183 insertions(+), 330 deletions(-)
diff --git a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/layer.xml
b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/layer.xml
index 14ca838..8ae9dc8 100644
--- a/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/layer.xml
+++ b/cnd/cnd.discovery/src/org/netbeans/modules/cnd/discovery/layer.xml
@@ -22,7 +22,6 @@
-->
<filesystem>
-
<folder name="Actions">
<folder name="View">
<file
name="org.netbeans.modules.cnd.discovery.wizard.DiscoveryWizardAction.instance">
diff --git a/cnd/cnd.makeproject/samples_src/freeway/arrow_left.bitmap
b/cnd/cnd.makeproject/samples_src/freeway/arrow_left.bitmap
index b80495c..4923314 100644
--- a/cnd/cnd.makeproject/samples_src/freeway/arrow_left.bitmap
+++ b/cnd/cnd.makeproject/samples_src/freeway/arrow_left.bitmap
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*/
#define arrow_left_width 32
diff --git a/cnd/cnd.makeproject/samples_src/freeway/arrow_over.bitmap
b/cnd/cnd.makeproject/samples_src/freeway/arrow_over.bitmap
index a41274b..70a5c9f 100644
--- a/cnd/cnd.makeproject/samples_src/freeway/arrow_over.bitmap
+++ b/cnd/cnd.makeproject/samples_src/freeway/arrow_over.bitmap
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*/
#define arrow_over_width 32
diff --git a/cnd/cnd.makeproject/samples_src/freeway/arrow_right.bitmap
b/cnd/cnd.makeproject/samples_src/freeway/arrow_right.bitmap
index 483f17c..3b04311 100644
--- a/cnd/cnd.makeproject/samples_src/freeway/arrow_right.bitmap
+++ b/cnd/cnd.makeproject/samples_src/freeway/arrow_right.bitmap
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*/
#define arrow_right_width 32
diff --git a/cnd/cnd.makeproject/samples_src/freeway/arrow_up.bitmap
b/cnd/cnd.makeproject/samples_src/freeway/arrow_up.bitmap
index b51ebd1..8a0861e 100644
--- a/cnd/cnd.makeproject/samples_src/freeway/arrow_up.bitmap
+++ b/cnd/cnd.makeproject/samples_src/freeway/arrow_up.bitmap
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*/
#define arrow_up_width 32
diff --git a/cnd/cnd.makeproject/samples_src/freeway/traffic.icon
b/cnd/cnd.makeproject/samples_src/freeway/traffic.icon
index 4036f33..578d5fc 100644
--- a/cnd/cnd.makeproject/samples_src/freeway/traffic.icon
+++ b/cnd/cnd.makeproject/samples_src/freeway/traffic.icon
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*/
/* Format_version=1, Width=64, Height=64, Depth=1, Valid_bits_per_item=16
diff --git a/cnd/cnd.makeproject/samples_src/freeway/traffic.mask
b/cnd/cnd.makeproject/samples_src/freeway/traffic.mask
index 4206118..6446e5e 100644
--- a/cnd/cnd.makeproject/samples_src/freeway/traffic.mask
+++ b/cnd/cnd.makeproject/samples_src/freeway/traffic.mask
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*/
/* Format_version=1, Width=64, Height=64, Depth=1, Valid_bits_per_item=16
diff --git a/cnd/cnd.makeproject/samples_src/hello/bar.f
b/cnd/cnd.makeproject/samples_src/hello/bar.f
index 0ac042a..6918240 100644
--- a/cnd/cnd.makeproject/samples_src/hello/bar.f
+++ b/cnd/cnd.makeproject/samples_src/hello/bar.f
@@ -1,31 +1,20 @@
!/*
-! * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+! * Licensed to the Apache Software Foundation (ASF) under one
+! * or more contributor license agreements. See the NOTICE file
+! * distributed with this work for additional information
+! * regarding copyright ownership. The ASF licenses this file
+! * to you under the Apache License, Version 2.0 (the
+! * "License"); you may not use this file except in compliance
+! * with the License. You may obtain a copy of the License at
! *
-! * Redistribution and use in source and binary forms, with or without
-! * modification, are permitted provided that the following conditions are met:
+! * http://www.apache.org/licenses/LICENSE-2.0
! *
-! * * Redistributions of source code must retain the above copyright notice,
-! * this list of conditions and the following disclaimer.
-! *
-! * * Redistributions in binary form must reproduce the above copyright notice,
-! * this list of conditions and the following disclaimer in the documentation
-! * and/or other materials provided with the distribution.
-! *
-! * * Neither the name of Oracle nor the names of its contributors
-! * may be used to endorse or promote products derived from this software
without
-! * specific prior written permission.
-! *
-! * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-! * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-! * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-! * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-! * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-! * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-! * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-! * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-! * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-! * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-! * THE POSSIBILITY OF SUCH DAMAGE.
+! * 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.
! */
subroutine bar()
diff --git a/cnd/cnd.makeproject/samples_src/hello/foo.f
b/cnd/cnd.makeproject/samples_src/hello/foo.f
index b24b25d..a2b6fb2 100644
--- a/cnd/cnd.makeproject/samples_src/hello/foo.f
+++ b/cnd/cnd.makeproject/samples_src/hello/foo.f
@@ -1,33 +1,21 @@
!/*
-! * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+! * Licensed to the Apache Software Foundation (ASF) under one
+! * or more contributor license agreements. See the NOTICE file
+! * distributed with this work for additional information
+! * regarding copyright ownership. The ASF licenses this file
+! * to you under the Apache License, Version 2.0 (the
+! * "License"); you may not use this file except in compliance
+! * with the License. You may obtain a copy of the License at
! *
-! * Redistribution and use in source and binary forms, with or without
-! * modification, are permitted provided that the following conditions are met:
+! * http://www.apache.org/licenses/LICENSE-2.0
! *
-! * * Redistributions of source code must retain the above copyright notice,
-! * this list of conditions and the following disclaimer.
-! *
-! * * Redistributions in binary form must reproduce the above copyright notice,
-! * this list of conditions and the following disclaimer in the documentation
-! * and/or other materials provided with the distribution.
-! *
-! * * Neither the name of Oracle nor the names of its contributors
-! * may be used to endorse or promote products derived from this software
without
-! * specific prior written permission.
-! *
-! * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-! * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-! * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-! * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-! * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-! * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-! * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-! * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-! * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-! * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-! * THE POSSIBILITY OF SUCH DAMAGE.
+! * 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.
! */
-
print *, 'hello from foo...'
call bar()
end
diff --git a/cnd/cnd.makeproject/samples_src/helloqt/HelloForm.cpp
b/cnd/cnd.makeproject/samples_src/helloqt/HelloForm.cpp
index f6a4eb1..231a024 100644
--- a/cnd/cnd.makeproject/samples_src/helloqt/HelloForm.cpp
+++ b/cnd/cnd.makeproject/samples_src/helloqt/HelloForm.cpp
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#include "HelloForm.h"
diff --git a/cnd/cnd.makeproject/samples_src/helloqt/newmain.cpp
b/cnd/cnd.makeproject/samples_src/helloqt/newmain.cpp
index 39f08ab..b23e454 100644
--- a/cnd/cnd.makeproject/samples_src/helloqt/newmain.cpp
+++ b/cnd/cnd.makeproject/samples_src/helloqt/newmain.cpp
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
#include <QApplication>
diff --git a/cnd/cnd.makeproject/samples_src/lexyacc/token.l
b/cnd/cnd.makeproject/samples_src/lexyacc/token.l
index cd3be14..649aafd 100644
--- a/cnd/cnd.makeproject/samples_src/lexyacc/token.l
+++ b/cnd/cnd.makeproject/samples_src/lexyacc/token.l
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.makeproject/samples_src/lexyacc/token.y
b/cnd/cnd.makeproject/samples_src/lexyacc/token.y
index 9345e48..6d69e29 100644
--- a/cnd/cnd.makeproject/samples_src/lexyacc/token.y
+++ b/cnd/cnd.makeproject/samples_src/lexyacc/token.y
@@ -1,31 +1,20 @@
/*
- * Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of Oracle nor the names of its contributors
- * may be used to endorse or promote products derived from this software
without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.makeproject/samples_src/sample.cookbook.txt
b/cnd/cnd.makeproject/samples_src/sample.cookbook.txt
index 5cb206d..33eb700 100644
--- a/cnd/cnd.makeproject/samples_src/sample.cookbook.txt
+++ b/cnd/cnd.makeproject/samples_src/sample.cookbook.txt
@@ -1,32 +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
#
-# Copyright (c) 2009-2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# * Neither the name of Oracle nor the names of its contributors
-# may be used to endorse or promote products derived from this software
without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
+# 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.
Follow these steps to create a sample project from a set of existing sources:
diff --git
a/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/resources/toolchaindefinition/GNU_debugger.xml
b/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/resources/toolchaindefinition/GNU_debugger.xml
index 0689c45..f17e2ca 100644
---
a/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/resources/toolchaindefinition/GNU_debugger.xml
+++
b/cnd/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/resources/toolchaindefinition/GNU_debugger.xml
@@ -20,6 +20,7 @@
-->
+
<toolchaindefinition
xmlns="http://www.netbeans.org/ns/cnd-toolchain-definition/1";>
<debugger id="GNU">
<tool name="gdb"/>
diff --git a/contrib/cnd.diagnostics.clank/nbproject/project.xml
b/contrib/cnd.diagnostics.clank/nbproject/project.xml
index afe6b8c..550f6cd 100644
--- a/contrib/cnd.diagnostics.clank/nbproject/project.xml
+++ b/contrib/cnd.diagnostics.clank/nbproject/project.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
