You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by em...@apache.org on 2017/10/03 15:54:13 UTC
[1/2] incubator-netbeans git commit: [NETBEANS-54] Module Review
openide.modules
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 737720408 -> 3f4bf2bfb
[NETBEANS-54] Module Review openide.modules
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/2f8b133a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/2f8b133a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/2f8b133a
Branch: refs/heads/master
Commit: 2f8b133afae4b978a1f21677f8cce9ac3909c711
Parents: f89fb98
Author: Emilian Bold <em...@apache.org>
Authored: Tue Sep 26 14:53:42 2017 +0300
Committer: Emilian Bold <em...@apache.org>
Committed: Tue Sep 26 14:53:42 2017 +0300
----------------------------------------------------------------------
.../openide/modules/doc-files/classpath.html | 55 +++++++-------------
.../modules/doc-files/i18n-branding.html | 55 +++++++-------------
2 files changed, 36 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/2f8b133a/openide.modules/src/org/openide/modules/doc-files/classpath.html
----------------------------------------------------------------------
diff --git a/openide.modules/src/org/openide/modules/doc-files/classpath.html b/openide.modules/src/org/openide/modules/doc-files/classpath.html
index e7d1636..8e5ec6e 100644
--- a/openide.modules/src/org/openide/modules/doc-files/classpath.html
+++ b/openide.modules/src/org/openide/modules/doc-files/classpath.html
@@ -1,42 +1,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><!-- -*- xhtml -*- -->
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+
+ 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 xmlns="http://www.w3.org/1999/xhtml">
<head>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/2f8b133a/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html
----------------------------------------------------------------------
diff --git a/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html b/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html
index df45e4e..78b0d54 100644
--- a/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html
+++ b/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html
@@ -1,42 +1,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><!-- -*- xhtml -*- -->
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+
+ 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 xmlns="http://www.w3.org/1999/xhtml">
<head>
[2/2] incubator-netbeans git commit: This closes 13
Posted by em...@apache.org.
This closes 13
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/3f4bf2bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/3f4bf2bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/3f4bf2bf
Branch: refs/heads/master
Commit: 3f4bf2bfbc2af6d7510517eb902f6faf158c8b1a
Parents: 7377204 2f8b133
Author: Emilian Bold <em...@apache.org>
Authored: Tue Oct 3 18:53:38 2017 +0300
Committer: Emilian Bold <em...@apache.org>
Committed: Tue Oct 3 18:53:38 2017 +0300
----------------------------------------------------------------------
.../openide/modules/doc-files/classpath.html | 55 +++++++-------------
.../modules/doc-files/i18n-branding.html | 55 +++++++-------------
2 files changed, 36 insertions(+), 74 deletions(-)
----------------------------------------------------------------------