You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/06 19:10:41 UTC
[GitHub] matthiasblaesing closed pull request #845: [NETBEANS-1074] Module
Review extbrowser.chrome
matthiasblaesing closed pull request #845: [NETBEANS-1074] Module Review extbrowser.chrome
URL: https://github.com/apache/incubator-netbeans/pull/845
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/extbrowser.chrome/licenseinfo.xml b/extbrowser.chrome/licenseinfo.xml
new file mode 100644
index 0000000000..e3a64f5f84
--- /dev/null
+++ b/extbrowser.chrome/licenseinfo.xml
@@ -0,0 +1,52 @@
+<?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>plugins/chrome/_locales/en/messages.json</file>
+ <file>plugins/chrome/manifest.json</file>
+ <file>plugins/chrome/img/netbeans128.png</file>
+ <file>plugins/chrome/img/netbeans16.png</file>
+ <file>plugins/chrome/img/netbeans48.png</file>
+ <file>plugins/chrome/img/presets/DESKTOP.png</file>
+ <file>plugins/chrome/img/presets/NETBOOK.png</file>
+ <file>plugins/chrome/img/presets/SMARTPHONE_LANDSCAPE.png</file>
+ <file>plugins/chrome/img/presets/SMARTPHONE_PORTRAIT.png</file>
+ <file>plugins/chrome/img/presets/TABLET_LANDSCAPE.png</file>
+ <file>plugins/chrome/img/presets/TABLET_PORTRAIT.png</file>
+ <file>plugins/chrome/img/presets/WIDESCREEN.png</file>
+ <file>plugins/chrome/img/presets/boxModel.png</file>
+ <file>plugins/chrome/img/presets/customize.png</file>
+ <file>plugins/chrome/img/presets/freezeJavaScript.png</file>
+ <file>plugins/chrome/img/presets/menu.png</file>
+ <file>plugins/chrome/img/presets/selectionMode.png</file>
+ <file>plugins/chrome/img/presets/sizeToFit.png</file>
+ <file>plugins/chrome/img/warnings/disconnectedDebugger.png</file>
+ <file>plugins/chrome/img/warnings/icon.png</file>
+ <file>plugins/chrome_web_store_resources/netbeans-cube-chrome.png</file>
+ <file>plugins/chrome_web_store_resources/screenshot_1280x800.jpg</file>
+ <file>src/org/netbeans/modules/extbrowser/chrome/resources/warning.png</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
diff --git a/extbrowser.chrome/plugins/chrome/img/netbeans128.png b/extbrowser.chrome/plugins/chrome/img/netbeans128.png
index f99dbb6b7a..0a6024aeda 100644
Binary files a/extbrowser.chrome/plugins/chrome/img/netbeans128.png and b/extbrowser.chrome/plugins/chrome/img/netbeans128.png differ
diff --git a/extbrowser.chrome/plugins/chrome/img/netbeans16.png b/extbrowser.chrome/plugins/chrome/img/netbeans16.png
index 52855d9a88..1b3bcd61d2 100644
Binary files a/extbrowser.chrome/plugins/chrome/img/netbeans16.png and b/extbrowser.chrome/plugins/chrome/img/netbeans16.png differ
diff --git a/extbrowser.chrome/plugins/chrome/img/netbeans48.png b/extbrowser.chrome/plugins/chrome/img/netbeans48.png
index 5cb350b90c..b7c45b0d61 100644
Binary files a/extbrowser.chrome/plugins/chrome/img/netbeans48.png and b/extbrowser.chrome/plugins/chrome/img/netbeans48.png differ
diff --git a/extbrowser.chrome/plugins/chrome/js/chrome.js b/extbrowser.chrome/plugins/chrome/js/chrome.js
index 40cd060ae2..9d23f37c2c 100644
--- a/extbrowser.chrome/plugins/chrome/js/chrome.js
+++ b/extbrowser.chrome/plugins/chrome/js/chrome.js
@@ -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 2012 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 2012 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.
*/
// Initialization/cleanup
diff --git a/extbrowser.chrome/plugins/chrome_web_store_resources/description.txt b/extbrowser.chrome/plugins/chrome_web_store_resources/description.txt
index 19dcf01bd5..cf5fe27fb4 100644
--- a/extbrowser.chrome/plugins/chrome_web_store_resources/description.txt
+++ b/extbrowser.chrome/plugins/chrome_web_store_resources/description.txt
@@ -1,3 +1,5 @@
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.
+
*** The NetBeans Connector is a Beta Release ***
With the release of NetBeans 7.3 Beta comes a new feature for editing and interacting with HTML5, JavaScript, and CSS3 based applications. This connector allows for tight integration with Google Chrome.
diff --git a/extbrowser.chrome/plugins/chrome_web_store_resources/netbeans-cube-chrome.png b/extbrowser.chrome/plugins/chrome_web_store_resources/netbeans-cube-chrome.png
index 822b37a67c..0a6024aeda 100644
Binary files a/extbrowser.chrome/plugins/chrome_web_store_resources/netbeans-cube-chrome.png and b/extbrowser.chrome/plugins/chrome_web_store_resources/netbeans-cube-chrome.png differ
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists