This is an automated email from the ASF dual-hosted git repository.
emi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new fdb5beb [NETBEANS-54] Module Review html.editor.lib
fdb5beb is described below
commit fdb5bebc2b05c50a4bb196a7d3daf1639a2e875d
Author: Marty Powell <[email protected]>
AuthorDate: Sun Oct 22 14:25:27 2017 -0400
[NETBEANS-54] Module Review html.editor.lib
Updated license for java files.
Updated license for test html files.
---
.../html/editor/lib/api/ProblemDescription.java | 53 ++++++----------------
.../modules/html/editor/lib/api/elements/Node.java | 53 ++++++----------------
.../data/input/HTMLCompletionQueryTest/index.html | 19 ++++++++
.../truncated_netbeans_front_page.html | 22 ++++++++-
.../data/input/HTMLSyntaxSupportTest/index.html | 19 ++++++++
5 files changed, 89 insertions(+), 77 deletions(-)
diff --git
a/html.editor.lib/src/org/netbeans/modules/html/editor/lib/api/ProblemDescription.java
b/html.editor.lib/src/org/netbeans/modules/html/editor/lib/api/ProblemDescription.java
index cf504b5..353de42 100644
---
a/html.editor.lib/src/org/netbeans/modules/html/editor/lib/api/ProblemDescription.java
+++
b/html.editor.lib/src/org/netbeans/modules/html/editor/lib/api/ProblemDescription.java
@@ -1,43 +1,20 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/**
+ * 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
*
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * 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]"
- *
- * 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 distributigon
- * 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 2008 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.
*/
package org.netbeans.modules.html.editor.lib.api;
diff --git
a/html.editor.lib/src/org/netbeans/modules/html/editor/lib/api/elements/Node.java
b/html.editor.lib/src/org/netbeans/modules/html/editor/lib/api/elements/Node.java
index 60842fe..b77055e 100644
---
a/html.editor.lib/src/org/netbeans/modules/html/editor/lib/api/elements/Node.java
+++
b/html.editor.lib/src/org/netbeans/modules/html/editor/lib/api/elements/Node.java
@@ -1,43 +1,20 @@
-/*
- * 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]"
- *
- * 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 distributigon
- * 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
*
- * Contributor(s):
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Portions Copyrighted 2008 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.
*/
package org.netbeans.modules.html.editor.lib.api.elements;
diff --git
a/html.editor.lib/test/unit/data/input/HTMLCompletionQueryTest/index.html
b/html.editor.lib/test/unit/data/input/HTMLCompletionQueryTest/index.html
index d3b5f23..d66b882 100644
--- a/html.editor.lib/test/unit/data/input/HTMLCompletionQueryTest/index.html
+++ b/html.editor.lib/test/unit/data/input/HTMLCompletionQueryTest/index.html
@@ -1,5 +1,24 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!--
+
+ 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>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >
diff --git
a/html.editor.lib/test/unit/data/input/HTMLCompletionQueryTest/truncated_netbeans_front_page.html
b/html.editor.lib/test/unit/data/input/HTMLCompletionQueryTest/truncated_netbeans_front_page.html
index 474617a..b85f9c0 100644
---
a/html.editor.lib/test/unit/data/input/HTMLCompletionQueryTest/truncated_netbeans_front_page.html
+++
b/html.editor.lib/test/unit/data/input/HTMLCompletionQueryTest/truncated_netbeans_front_page.html
@@ -1,6 +1,26 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!--
+
+ 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>
-
+
<head>
<script src="/branding/scripts/tigris.js" type="text/javascript"></script>
diff --git
a/html.editor.lib/test/unit/data/input/HTMLSyntaxSupportTest/index.html
b/html.editor.lib/test/unit/data/input/HTMLSyntaxSupportTest/index.html
index d3b5f23..d66b882 100644
--- a/html.editor.lib/test/unit/data/input/HTMLSyntaxSupportTest/index.html
+++ b/html.editor.lib/test/unit/data/input/HTMLSyntaxSupportTest/index.html
@@ -1,5 +1,24 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!--
+
+ 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>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
