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/08/28 17:08:29 UTC
[GitHub] matthiasblaesing closed pull request #800: [NETBEANS-1074] Module
Review cordova
matthiasblaesing closed pull request #800: [NETBEANS-1074] Module Review cordova
URL: https://github.com/apache/incubator-netbeans/pull/800
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/cordova/CordovaMapsSample/www/index.html b/cordova/CordovaMapsSample/www/index.html
index 7c9eb80f4a..e1174f7a36 100644
--- a/cordova/CordovaMapsSample/www/index.html
+++ b/cordova/CordovaMapsSample/www/index.html
@@ -1,42 +1,24 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 2013, 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):
-->
+
<!DOCTYPE html>
<html>
<head>
diff --git a/cordova/CordovaMapsSample/www/readme.md b/cordova/CordovaMapsSample/www/readme.md
index 2fdd4e5715..0dc8b4b154 100644
--- a/cordova/CordovaMapsSample/www/readme.md
+++ b/cordova/CordovaMapsSample/www/readme.md
@@ -1,3 +1,24 @@
+<!--
+
+ 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.
+
+-->
+
# Google Maps with Cordova #
Sample application using Google Maps and Cordova APIs
diff --git a/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/AndroidManifest.xml b/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/AndroidManifest.xml
index edc91df604..2a5e0ac26f 100644
--- a/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/AndroidManifest.xml
+++ b/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/AndroidManifest.xml
@@ -1,4 +1,26 @@
<?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.
+
+-->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
package="com.company" android:versionName="1.0" android:versionCode="1" android:hardwareAccelerated="true">
<supports-screens
diff --git a/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/Info-plist.xml b/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/Info-plist.xml
index 09023a98f3..d542b34910 100644
--- a/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/Info-plist.xml
+++ b/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/Info-plist.xml
@@ -1,5 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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.
+
+-->
+
<plist version="1.0">
<dict>
<key>CFBundleIcons</key>
diff --git a/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/config.xml b/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/config.xml
index d2d32b1743..197ed97d0f 100644
--- a/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/config.xml
+++ b/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/config.xml
@@ -1,4 +1,26 @@
<?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.
+
+-->
+
<widget xmlns = "http://www.w3.org/ns/widgets"
xmlns:gap = "http://phonegap.com/ns/1.0"
id = "$id"
diff --git a/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/dev_config.xml b/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/dev_config.xml
index f2efc3705e..f2cd6326d7 100644
--- a/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/dev_config.xml
+++ b/cordova/cordovaprojectupdate/test/org/netbeans/modules/cordova/updatetask/dev_config.xml
@@ -1,4 +1,26 @@
<?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.
+
+-->
+
<cordova>
<content src="index.html" />
<log level="DEBUG" />
diff --git a/cordova/licenseinfo.xml b/cordova/licenseinfo.xml
new file mode 100644
index 0000000000..3a1086c3aa
--- /dev/null
+++ b/cordova/licenseinfo.xml
@@ -0,0 +1,39 @@
+<?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>CordovaMapsSample/www/img/compass.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/androiddevice.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/androiddevice16.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/androidemulator.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/androidemulator16.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/iosdevice.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/iosdevice16.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/iossimulator.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/iossimulator16.png</file>
+ <file>src/org/netbeans/modules/cordova/resources/project.png</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
diff --git a/cordova/src/org/netbeans/modules/cordova/empty.properties b/cordova/src/org/netbeans/modules/cordova/empty.properties
index c84f77b029..5721c93983 100644
--- a/cordova/src/org/netbeans/modules/cordova/empty.properties
+++ b/cordova/src/org/netbeans/modules/cordova/empty.properties
@@ -1,3 +1,20 @@
+# 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.
+
# This is a list of plugins installed in your project
# You can delete or add new plugins
#
diff --git a/cordova/src/org/netbeans/modules/cordova/mapplugins.properties b/cordova/src/org/netbeans/modules/cordova/mapplugins.properties
index de325462fa..2884476627 100644
--- a/cordova/src/org/netbeans/modules/cordova/mapplugins.properties
+++ b/cordova/src/org/netbeans/modules/cordova/mapplugins.properties
@@ -1,3 +1,20 @@
+# 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.
+
# This is a list of plugins required by Cordova Maps Sample
#
# Format is following:
diff --git a/cordova/src/org/netbeans/modules/cordova/plugins.properties b/cordova/src/org/netbeans/modules/cordova/plugins.properties
index 505884db0d..a66252043f 100644
--- a/cordova/src/org/netbeans/modules/cordova/plugins.properties
+++ b/cordova/src/org/netbeans/modules/cordova/plugins.properties
@@ -1,3 +1,20 @@
+# 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.
+
# This is a list of plugins installed in your project
# You can delete or add new plugins
#
----------------------------------------------------------------
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