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/10/08 14:14:56 UTC
[1/2] incubator-netbeans git commit: [NETBEANS-54] Module Review
editor.codetemplates
Repository: incubator-netbeans
Updated Branches:
refs/heads/master b8762ab60 -> b3e46210e
[NETBEANS-54] Module Review editor.codetemplates
* No external libraries.
* A nbproject/*sig that will be handled centrally.
* Added licenses to 4 xml test files.
* Test org.netbeans.lib.editor.codetemplates.CodeTemplatesTest FAILED...
... but ant -Dtest-unit-sys-prop.ignore.random.failures=true test did not fail.
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/9439494b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/9439494b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/9439494b
Branch: refs/heads/master
Commit: 9439494bf1f3b09d4f59307edd3e1715ecd3ba49
Parents: 3880c51
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Tue Oct 3 22:48:49 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 16:10:43 2017 +0200
----------------------------------------------------------------------
editor.codetemplates/apichanges.xml | 62 ++++++--------------
.../codetemplates/storage/ct-all-languages.xml | 20 +++++++
.../editor/codetemplates/storage/ct-legacy.xml | 20 +++++++
.../editor/codetemplates/storage/ct-module.xml | 20 +++++++
.../editor/codetemplates/storage/ct-user.xml | 20 +++++++
5 files changed, 99 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9439494b/editor.codetemplates/apichanges.xml
----------------------------------------------------------------------
diff --git a/editor.codetemplates/apichanges.xml b/editor.codetemplates/apichanges.xml
index 56bf307..f43cd70 100644
--- a/editor.codetemplates/apichanges.xml
+++ b/editor.codetemplates/apichanges.xml
@@ -1,49 +1,25 @@
<?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.
+
-->
+<!-- Search for CHANGEME in this document when copying and using it: -->
<?xml-stylesheet type="text/xml" href="../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/9439494b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-all-languages.xml
----------------------------------------------------------------------
diff --git a/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-all-languages.xml b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-all-languages.xml
index fe2bd85..a8ccdfe 100644
--- a/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-all-languages.xml
+++ b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-all-languages.xml
@@ -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.
+
+-->
<!DOCTYPE codetemplates PUBLIC "-//NetBeans//DTD Editor Code Templates settings 1.0//EN" "http://www.netbeans.org/dtds/EditorCodeTemplates-1_0.dtd">
<codetemplates>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9439494b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-legacy.xml
----------------------------------------------------------------------
diff --git a/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-legacy.xml b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-legacy.xml
index fe493c1..08e5061 100644
--- a/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-legacy.xml
+++ b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-legacy.xml
@@ -1,4 +1,24 @@
<?xml version="1.0"?>
+<!--
+
+ 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 abbrevs PUBLIC "-//NetBeans//DTD Editor Abbreviations settings 1.0//EN"
"http://www.netbeans.org/dtds/EditorAbbreviations-1_0.dtd">
<abbrevs>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9439494b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-module.xml
----------------------------------------------------------------------
diff --git a/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-module.xml b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-module.xml
index 8587a4a..3625648 100644
--- a/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-module.xml
+++ b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-module.xml
@@ -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.
+
+-->
<!DOCTYPE codetemplates PUBLIC "-//NetBeans//DTD Editor Code Templates settings 1.0//EN" "http://www.netbeans.org/dtds/EditorCodeTemplates-1_0.dtd">
<codetemplates>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/9439494b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-user.xml
----------------------------------------------------------------------
diff --git a/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-user.xml b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-user.xml
index e045538..24983a3 100644
--- a/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-user.xml
+++ b/editor.codetemplates/test/unit/src/org/netbeans/lib/editor/codetemplates/storage/ct-user.xml
@@ -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.
+
+-->
<!DOCTYPE codetemplates PUBLIC "-//NetBeans//DTD Editor Code Templates settings 1.0//EN" "http://www.netbeans.org/dtds/EditorCodeTemplates-1_0.dtd">
<codetemplates>
[2/2] incubator-netbeans git commit: Merge branch 'pr/53'
Posted by ma...@apache.org.
Merge branch 'pr/53'
This closes #53
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/b3e46210
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/b3e46210
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/b3e46210
Branch: refs/heads/master
Commit: b3e46210ecc2ac2a8c0768d908c31e4e13b9cd08
Parents: b8762ab 9439494
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 16:13:37 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 16:13:37 2017 +0200
----------------------------------------------------------------------
editor.codetemplates/apichanges.xml | 62 ++++++--------------
.../codetemplates/storage/ct-all-languages.xml | 20 +++++++
.../editor/codetemplates/storage/ct-legacy.xml | 20 +++++++
.../editor/codetemplates/storage/ct-module.xml | 20 +++++++
.../editor/codetemplates/storage/ct-user.xml | 20 +++++++
5 files changed, 99 insertions(+), 43 deletions(-)
----------------------------------------------------------------------