You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/09/30 13:57:21 UTC
[1/2] incubator-netbeans git commit: [NETBEANS-54] Module review
uihandler -change header for apache bad detection of the convert tool
Repository: incubator-netbeans
Updated Branches:
refs/heads/master ac84c02c9 -> e75bcd80a
[NETBEANS-54] Module review uihandler
-change header for apache bad detection of the convert tool
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/08936081
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/08936081
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/08936081
Branch: refs/heads/master
Commit: 089360811963d819d8faf20fc81c8f259f8a296d
Parents: a5e6174
Author: Eric Barboni <sk...@apache.org>
Authored: Tue Sep 26 11:43:24 2017 +0200
Committer: Eric Barboni <sk...@apache.org>
Committed: Sat Sep 30 14:17:44 2017 +0200
----------------------------------------------------------------------
.../netbeans/modules/uihandler/api/package.html | 50 ++++++--------------
1 file changed, 14 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/08936081/uihandler/src/org/netbeans/modules/uihandler/api/package.html
----------------------------------------------------------------------
diff --git a/uihandler/src/org/netbeans/modules/uihandler/api/package.html b/uihandler/src/org/netbeans/modules/uihandler/api/package.html
index 978216d..21f341c 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/api/package.html
+++ b/uihandler/src/org/netbeans/modules/uihandler/api/package.html
@@ -3,45 +3,23 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body><!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+ http://www.apache.org/licenses/LICENSE-2.0
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-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 2009 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.
-->
<body>
[2/2] incubator-netbeans git commit: Merge branch 'pr/15'
Posted by ma...@apache.org.
Merge branch 'pr/15'
Changeset small enough not to need an ICLA
This closes #15
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/e75bcd80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/e75bcd80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/e75bcd80
Branch: refs/heads/master
Commit: e75bcd80abccf514fa12ac0afee16b2235477754
Parents: ac84c02 0893608
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Sep 30 15:55:40 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sat Sep 30 15:55:40 2017 +0200
----------------------------------------------------------------------
.../netbeans/modules/uihandler/api/package.html | 50 ++++++--------------
1 file changed, 14 insertions(+), 36 deletions(-)
----------------------------------------------------------------------