netbeans-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] junichi11 closed pull request #158: [NETBEANS-54] Module Review css.editor
Date Thu, 01 Jan 1970 00:00:00 GMT
junichi11 closed pull request #158: [NETBEANS-54] Module Review css.editor
URL: https://github.com/apache/incubator-netbeans/pull/158
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 b9bbe8372..5201e9303 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 412dcde7a..c4a5d26af 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 5a5e61cde..76e3f218f 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2043,6 +2043,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"
/>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message