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 12:20:35 UTC
[1/5] incubator-netbeans git commit: [NETBEANS-54] Module Review
db.mysql
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 9a152a75f -> bd9aece9f
[NETBEANS-54] Module Review db.mysql
- no external library
- checked Rat report; unrecognized license headers manually changed,
ignored manifest.mf and *.form (see central problems)
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/01991399
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/01991399
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/01991399
Branch: refs/heads/master
Commit: 0199139931801366af250027f54cdda209ae106d
Parents: 64a43c0
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Sep 29 21:14:59 2017 +0200
Committer: Emilian Bold <em...@apache.org>
Committed: Tue Oct 3 15:10:27 2017 +0300
----------------------------------------------------------------------
.../db/mysql/resources/create-sample.sql | 57 ++++++--------------
.../db/mysql/resources/create-travel.sql | 56 ++++++-------------
.../modules/db/mysql/resources/create-vir.sql | 56 ++++++-------------
3 files changed, 46 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/01991399/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql
----------------------------------------------------------------------
diff --git a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql
index ddf7cda..e78b2c0 100644
--- a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql
+++ b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-sample.sql
@@ -1,45 +1,20 @@
-
--- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
--- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
--
--- Oracle and Java are registered trademarks of Oracle and/or its affiliates.
--- Other names may be trademarks of their respective owners.
-
--- 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.
+-- 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.
+
CREATE TABLE customer (
customer_id INTEGER PRIMARY KEY NOT NULL,
discount_code CHARACTER(1) NOT NULL,
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/01991399/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql
----------------------------------------------------------------------
diff --git a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql
index f0663cf..2eaf303 100644
--- a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql
+++ b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-travel.sql
@@ -1,45 +1,19 @@
-
--- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
--- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
--
--- Oracle and Java are registered trademarks of Oracle and/or its affiliates.
--- Other names may be trademarks of their respective owners.
-
--- 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.
+-- 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.
create table travel.triptype (
triptypeid INTEGER NOT NULL,
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/01991399/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql
----------------------------------------------------------------------
diff --git a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql
index 343b8f8..f5bd1ca 100644
--- a/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql
+++ b/db.mysql/src/org/netbeans/modules/db/mysql/resources/create-vir.sql
@@ -1,45 +1,19 @@
-
--- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
--- Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
--
--- Oracle and Java are registered trademarks of Oracle and/or its affiliates.
--- Other names may be trademarks of their respective owners.
-
--- 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.
+-- 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.
-- Create validation table
CREATE TABLE vir.validation (
[2/5] incubator-netbeans git commit: [NETBEANS-54] Module Review
defaults
Posted by em...@apache.org.
[NETBEANS-54] Module Review defaults
- no external library
- checked Rat report; unrecognized license headers manually changed
- skimmed through the module, did not notice additional problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/64a43c00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/64a43c00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/64a43c00
Branch: refs/heads/master
Commit: 64a43c0064ef282e2977c822cd70285b3b3dbb5d
Parents: cf8ec0d
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Sep 30 22:43:27 2017 +0200
Committer: Emilian Bold <em...@apache.org>
Committed: Tue Oct 3 15:10:27 2017 +0300
----------------------------------------------------------------------
.../defaults/NetBeans55-SQL-fontsColors.xml | 52 ++++++--------------
1 file changed, 14 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/64a43c00/defaults/src/org/netbeans/modules/defaults/NetBeans55-SQL-fontsColors.xml
----------------------------------------------------------------------
diff --git a/defaults/src/org/netbeans/modules/defaults/NetBeans55-SQL-fontsColors.xml b/defaults/src/org/netbeans/modules/defaults/NetBeans55-SQL-fontsColors.xml
index f088bef..6797bf1 100644
--- a/defaults/src/org/netbeans/modules/defaults/NetBeans55-SQL-fontsColors.xml
+++ b/defaults/src/org/netbeans/modules/defaults/NetBeans55-SQL-fontsColors.xml
@@ -1,48 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 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.
-->
<fontscolors>
<fontcolor name="default" default="default"/>
[3/5] incubator-netbeans git commit: [NETBEANS-54] Module Review
server
Posted by em...@apache.org.
[NETBEANS-54] Module Review server
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/7d5633a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/7d5633a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/7d5633a4
Branch: refs/heads/master
Commit: 7d5633a4184610fceaea815dad4be17f347032fc
Parents: 0199139
Author: borxa <bo...@varelabouzas.net>
Authored: Sun Oct 1 18:54:40 2017 +0200
Committer: Emilian Bold <em...@apache.org>
Committed: Tue Oct 3 15:10:28 2017 +0300
----------------------------------------------------------------------
server/apichanges.xml | 60 ++++++--------------
.../netbeans/modules/server/resources/layer.xml | 52 +++++------------
2 files changed, 32 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/7d5633a4/server/apichanges.xml
----------------------------------------------------------------------
diff --git a/server/apichanges.xml b/server/apichanges.xml
index b9b171e..af175db 100644
--- a/server/apichanges.xml
+++ b/server/apichanges.xml
@@ -1,48 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Search for CHANGEME in this document when copying and using it: -->
<!--
-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-2006 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.
+
-->
<?xml-stylesheet type="text/xml" href="CHANGEME/nbbuild/javadoctools/apichanges.xsl"?>
<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/7d5633a4/server/src/org/netbeans/modules/server/resources/layer.xml
----------------------------------------------------------------------
diff --git a/server/src/org/netbeans/modules/server/resources/layer.xml b/server/src/org/netbeans/modules/server/resources/layer.xml
index fb045d2..3a1ced1 100644
--- a/server/src/org/netbeans/modules/server/resources/layer.xml
+++ b/server/src/org/netbeans/modules/server/resources/layer.xml
@@ -1,48 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
- The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 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.
-->
<filesystem>
<folder name="Menu">
[5/5] incubator-netbeans git commit: Merge branch 'master' of
https://github.com/apache/incubator-netbeans
Posted by em...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-netbeans
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/bd9aece9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/bd9aece9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/bd9aece9
Branch: refs/heads/master
Commit: bd9aece9fe41772d56510c47caf243bd06ca1958
Parents: ff5f3c4 9a152a7
Author: Emilian Bold <em...@apache.org>
Authored: Tue Oct 3 15:10:44 2017 +0300
Committer: Emilian Bold <em...@apache.org>
Committed: Tue Oct 3 15:10:44 2017 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/5] incubator-netbeans git commit: Made Git keyfile auto detection
when key auth is selected.
Posted by em...@apache.org.
Made Git keyfile auto detection when key auth is selected.
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/ff5f3c4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/ff5f3c4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/ff5f3c4e
Branch: refs/heads/master
Commit: ff5f3c4e175cf15c1b4b0caebfb5047be4196a44
Parents: 7d5633a
Author: Laszlo Kishalmi <la...@gmail.com>
Authored: Fri Sep 29 15:03:39 2017 -0700
Committer: Emilian Bold <em...@apache.org>
Committed: Tue Oct 3 15:10:29 2017 +0300
----------------------------------------------------------------------
.../git/ui/repository/remote/RemoteRepository.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/ff5f3c4e/git/src/org/netbeans/modules/git/ui/repository/remote/RemoteRepository.java
----------------------------------------------------------------------
diff --git a/git/src/org/netbeans/modules/git/ui/repository/remote/RemoteRepository.java b/git/src/org/netbeans/modules/git/ui/repository/remote/RemoteRepository.java
index 252040c..b353f29 100644
--- a/git/src/org/netbeans/modules/git/ui/repository/remote/RemoteRepository.java
+++ b/git/src/org/netbeans/modules/git/ui/repository/remote/RemoteRepository.java
@@ -844,6 +844,9 @@ public class RemoteRepository implements DocumentListener, ActionListener, ItemL
for (JComponent c : authPasswordFields) {
c.setEnabled(authViaPassword);
}
+ if (authViaPrivateKey && settingsPanel.txtIdentityFile.getText().trim().isEmpty()) {
+ settingsPanel.txtIdentityFile.setText(getDefaultIdentityFilePath());
+ }
}
@Override
@@ -853,9 +856,13 @@ public class RemoteRepository implements DocumentListener, ActionListener, ItemL
private String getDefaultIdentityFilePath () {
String identityFile = ""; //NOI18N
- if (!Utilities.isWindows()) {
- identityFile = System.getProperty("user.home") + File.separator //NOI18N
- + ".ssh" + File.separator + "id_dsa"; //NOI18N
+ File sshDir = new File(System.getProperty("user.home"), ".ssh"); //NOI18N
+ File rsaKey = new File(sshDir, "id_rsa"); //NOI18N
+ File dsaKey = new File(sshDir, "id_dsa"); //NOI18N
+ if (rsaKey.canRead()) {
+ identityFile = rsaKey.getAbsolutePath();
+ } else if (dsaKey.canRead()) {
+ identityFile = dsaKey.getAbsolutePath();
}
return identityFile;
}