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 2017/10/23 06:06:23 UTC
[incubator-netbeans] branch master updated: [NETBEANS-54] Module
Review css.editor
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 0987ee2 [NETBEANS-54] Module Review css.editor
0987ee2 is described below
commit 0987ee23934f30d0bbb713dcb4534e857ebfbde0
Author: Ross Lamont <rl...@componentcorp.com>
AuthorDate: Wed Oct 18 12:49:44 2017 +1100
[NETBEANS-54] Module Review css.editor
- external library and license need further review. License is probably compatible (some w3c licenses, but not these, listed at https://www.apache.org/legal/resolved.html). No idea where to get maven versions of zips.
- css21-spec.zip
- css3-spec.zip
- exclusions:
- all test data
- “todo” file in root (no significant creativity)
- ignored:
- description.txt (central problems)
- CascadeStyleSheet.css.template (user viewable template)
- CssExample (user viewable template)
- license added or replaced:
- webkit.properties
- line.properties
---
.../editor/module/main/browsers/webkit.properties | 51 ++++++----------------
.../editor/module/main/properties/line.properties | 51 ++++++----------------
nbbuild/build.xml | 4 ++
3 files changed, 32 insertions(+), 74 deletions(-)
diff --git a/css.editor/src/org/netbeans/modules/css/editor/module/main/browsers/webkit.properties b/css.editor/src/org/netbeans/modules/css/editor/module/main/browsers/webkit.properties
index b9bbe83..5201e93 100644
--- a/css.editor/src/org/netbeans/modules/css/editor/module/main/browsers/webkit.properties
+++ b/css.editor/src/org/netbeans/modules/css/editor/module/main/browsers/webkit.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER
-
-# Copyright 2011 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 GN
-# General Public License Version 2 only ("GPL") or the Commo
-# Development and Distribution License("CDDL") (collectively, th
-# "License"). You may not use this file except in compliance with th
-# License. You can obtain a copy of the License a
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for th
-# specific language governing permissions and limitations under th
-# License. When distributing the software, include this License Heade
-# Notice in each file and include the License file a
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates thi
-# particular file as subject to the "Classpath" exception as provide
-# by Oracle in the GPL Version 2 section of the License file tha
-# accompanied this code. If applicable, add the following below th
-# License Header, with the fields enclosed by brackets [] replaced b
-# 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 CDD
-# or only the GPL Version 2, indicate your decision by addin
-# "[Contributor] elects to include this software in this distributio
-# under the [CDDL or GPL Version 2] license." If you do not indicate
-# single choice of license, a recipient has the option to distribut
-# your version of this file under either the CDDL, the GPL Version 2 o
-# to extend the choice of license to its licensees as provided above
-# However, if you add GPL Version 2 code and therefore, elected the GP
-# Version 2 license, then the option applies only if the new code i
-# 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 2011 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.
#
#-------------------------------------------------------------------------------
#
diff --git a/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/line.properties b/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/line.properties
index 412dcde..c4a5d26 100644
--- a/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/line.properties
+++ b/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/line.properties
@@ -1,42 +1,19 @@
-# 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 2011 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 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):
-#
-# Portions Copyrighted 2011 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.
#
# Css line layout module
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 6c9b197..8f1114b 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2075,6 +2075,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="css.prep/test/unit/data/testFiles/test.less" /> <!--simple file forss testing-->
<exclude name="css.prep/test/unit/data/testFiles/testIssue227676.scss" /> <!--simple file for testing-->
<exclude name="css.prep/test/unit/data/testProject/public_html/*" /> <!--simple files for testing-->
+ <exclude name="css.editor/test/unit/data/testfiles/**" /> <!--simple files for testing-->
+ <exclude name="css.editor/todo" /> <!-- no degree of creativity -->
+ <exclude name="css.editor/src/org/netbeans/modules/css/resources/CascadeStyleSheet.css.template" /> <!-- user visible template -->
+ <exclude name="css.editor/src/org/netbeans/modules/css/resources/CssExample" /> <!-- user visible template -->
<exclude name="junit.ui/src/org/netbeans/modules/junit/ui/resources/*.template" /> <!--license would be visible when users edit the templates inside their IDE-->
<exclude name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens" /> <!--generated by ANTLR-->
<exclude name="javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/**/*.fxml" />
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].