You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2018/08/21 20:18:07 UTC
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module
Review javascript.jstestdriver (#741)
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 80dfed1 [NETBEANS-1074] Module Review javascript.jstestdriver (#741)
80dfed1 is described below
commit 80dfed158e5d7b0eecd2e64fd35079d03dd72767
Author: Junichi Yamamoto <ju...@gmail.com>
AuthorDate: Wed Aug 22 05:18:03 2018 +0900
[NETBEANS-1074] Module Review javascript.jstestdriver (#741)
- Change the license header of jsTestDriver.conf
- Add the licenseinfo.xml
---
javascript.jstestdriver/licenseinfo.xml | 30 ++++++++++++++
.../jstestdriver/resources/jsTestDriver.conf | 47 +++++++---------------
2 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/javascript.jstestdriver/licenseinfo.xml b/javascript.jstestdriver/licenseinfo.xml
new file mode 100644
index 0000000..a64e839
--- /dev/null
+++ b/javascript.jstestdriver/licenseinfo.xml
@@ -0,0 +1,30 @@
+<?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.
+
+-->
+<licenseinfo>
+ <fileset>
+ <file>src/org/netbeans/modules/javascript/jstestdriver/resources/JsTestDriver.png</file>
+ <file>src/org/netbeans/modules/javascript/jstestdriver/resources/running.png</file>
+ <file>src/org/netbeans/modules/javascript/jstestdriver/resources/waiting.png</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
diff --git a/javascript.jstestdriver/src/org/netbeans/modules/javascript/jstestdriver/resources/jsTestDriver.conf b/javascript.jstestdriver/src/org/netbeans/modules/javascript/jstestdriver/resources/jsTestDriver.conf
index 4a386c5..0b2bfee 100644
--- a/javascript.jstestdriver/src/org/netbeans/modules/javascript/jstestdriver/resources/jsTestDriver.conf
+++ b/javascript.jstestdriver/src/org/netbeans/modules/javascript/jstestdriver/resources/jsTestDriver.conf
@@ -1,41 +1,22 @@
<#--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2016 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]"
+ 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.
-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):
-->
server: http://localhost:42442
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists