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/11/05 20:08:54 UTC
[incubator-netbeans] branch master updated (ef85dd8 -> cf4990f)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from ef85dd8 Merge pull request #247 from jlahoda/read-master-licenses-utf8
new de049ad [NETBEANS-54] Module Review html.editor
new 65bcda0 [NETBEANS-54] Module Review html.editor
new cf4990f Merge branch 'pr/235'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../netbeans/modules/html/editor/Bundle.properties | 55 ++++++----------------
.../modules/html/editor/hints/Bundle.properties | 55 ++++++----------------
.../html/editor/hints/css/Bundle.properties | 55 ++++++----------------
nbbuild/build.xml | 5 ++
4 files changed, 50 insertions(+), 120 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].
[incubator-netbeans] 01/03: [NETBEANS-54] Module Review html.editor
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit de049ad47745eea8f0108ae16127729bc957bc55
Author: Borxa Varela Bouzas <bo...@varelabouzas.net>
AuthorDate: Sat Nov 4 05:58:17 2017 +0100
[NETBEANS-54] Module Review html.editor
---
.../netbeans/modules/html/editor/Bundle.properties | 55 ++++++----------------
.../modules/html/editor/hints/Bundle.properties | 55 ++++++----------------
.../html/editor/hints/css/Bundle.properties | 55 ++++++----------------
3 files changed, 45 insertions(+), 120 deletions(-)
diff --git a/html.editor/src/org/netbeans/modules/html/editor/Bundle.properties b/html.editor/src/org/netbeans/modules/html/editor/Bundle.properties
index 93afa13..2a219fd 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/Bundle.properties
+++ b/html.editor/src/org/netbeans/modules/html/editor/Bundle.properties
@@ -1,44 +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-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.
+# 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.
HtmlCompletionOptionsPanel.autocompleteQuotesAfterEQSCheckBox.text=Equals-sign (=) Keypress After Attribute Name Autocompletes Quote Set
HtmlCompletionOptionsPanel.autocompleteQuotesCheckBox.text=Quote-mark (") Keypress After Attribute Name Autocompletes Closing Quote
HtmlCompletionOptionsPanel.completionOffersEndTagAfterLt.text=Completion Offers End Tags After Less Than (<) Character
diff --git a/html.editor/src/org/netbeans/modules/html/editor/hints/Bundle.properties b/html.editor/src/org/netbeans/modules/html/editor/hints/Bundle.properties
index ab4dc38..ea39160 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/hints/Bundle.properties
+++ b/html.editor/src/org/netbeans/modules/html/editor/hints/Bundle.properties
@@ -1,44 +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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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.
+# 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.
#Options
csl-hints/text/html/hints/general=HTML Validator
diff --git a/html.editor/src/org/netbeans/modules/html/editor/hints/css/Bundle.properties b/html.editor/src/org/netbeans/modules/html/editor/hints/css/Bundle.properties
index dd1b3f9..1f23921 100644
--- a/html.editor/src/org/netbeans/modules/html/editor/hints/css/Bundle.properties
+++ b/html.editor/src/org/netbeans/modules/html/editor/hints/css/Bundle.properties
@@ -1,44 +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-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.
+# 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.
#Options
csl-hints/text/html/hints/css=CSS
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.
[incubator-netbeans] 03/03: Merge branch 'pr/235'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit cf4990f5761a10833e3fa591b26447ee254ad76e
Merge: ef85dd8 65bcda0
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sun Nov 5 21:08:31 2017 +0100
Merge branch 'pr/235'
This closes #235
.../netbeans/modules/html/editor/Bundle.properties | 55 ++++++----------------
.../modules/html/editor/hints/Bundle.properties | 55 ++++++----------------
.../html/editor/hints/css/Bundle.properties | 55 ++++++----------------
nbbuild/build.xml | 5 ++
4 files changed, 50 insertions(+), 120 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.
[incubator-netbeans] 02/03: [NETBEANS-54] Module Review html.editor
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 65bcda0e87ce7f94ca77668cba5b448f52986f1c
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sun Nov 5 21:02:09 2017 +0100
[NETBEANS-54] Module Review html.editor
---
nbbuild/build.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 3c2def5..db10246 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2026,6 +2026,11 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="extbrowser/test/unit/src/org/netbeans/modules/extbrowser/data/mac_defaults_*" /> <!--test data-->
<exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/Hibernate*.xml" /> <!--template files-->
<exclude name="hibernate/src/org/netbeans/modules/hibernate/resources/HibernateUtil.javax" /> <!--template file-->
+ <exclude name="html.editor/src/org/netbeans/modules/html/editor/options/ui/formatSample.html" /> <!--user visible file template-->
+ <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/HTMLExample" /> <!--user visible file template-->
+ <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/XHTMLExample" /> <!--user visible file template-->
+ <exclude name="html.editor/src/org/netbeans/modules/html/editor/todo.txt" /> <!--no degree of creativity-->
+ <exclude name="html.editor/src/org/netbeans/modules/html/editor/resources/DTDs/*/catalog" /> <!--no degree of creativity-->
<exclude name="hudson.subversion/test/unit/src/org/netbeans/modules/hudson/subversion/sample-entries-file" /> <!--test data-->
<exclude name="ide/launcher/macosx/NetBeansLauncher/ReadMe.rtf" /> <!--does not natively support comments-->
<exclude name="j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/resources/*.xsd" /> <!-- XSDs for usage at runtime and code generation - the XSDs are not modified, so covered by https://www.apache.org/legal/resolved.html#category-b -->
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.