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/22 17:07:41 UTC
[GitHub] matthiasblaesing closed pull request #702: [NETBEANS-1074] Module
Review web.core.syntax
matthiasblaesing closed pull request #702: [NETBEANS-1074] Module Review web.core.syntax
URL: https://github.com/apache/incubator-netbeans/pull/702
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/web.core.syntax/external/binaries-list b/web.core.syntax/external/binaries-list
index 1744dcbd7c..45654bad57 100644
--- a/web.core.syntax/external/binaries-list
+++ b/web.core.syntax/external/binaries-list
@@ -1,3 +1,19 @@
+# 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.
F6E990DF59BD1FD2058320002A853A5411A45CD4 syntaxref20.zip
41990E587485D3C6360FFF0EC8F8D2D3F53EC874 jsf12-tlddoc.zip
9D80B456AFA21D92147F4BC4BB532335ADAC2C03 jstl11-doc.zip
diff --git a/web.core.syntax/l10n.list b/web.core.syntax/l10n.list
index a6275697ec..8fc0b74340 100644
--- a/web.core.syntax/l10n.list
+++ b/web.core.syntax/l10n.list
@@ -1,3 +1,19 @@
+# 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.
# web/jspsyntax
read global
web/external/syntaxref20.zip
diff --git a/web.core.syntax/licenseinfo.xml b/web.core.syntax/licenseinfo.xml
new file mode 100644
index 0000000000..2e2b500b10
--- /dev/null
+++ b/web.core.syntax/licenseinfo.xml
@@ -0,0 +1,38 @@
+<?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/web/core/syntax/completion/resources/class_16.png</file>
+ <file>src/org/netbeans/modules/web/core/syntax/completion/resources/bean_16.png</file>
+ <file>src/org/netbeans/modules/web/core/syntax/completion/resources/function_16.png</file>
+ <file>src/org/netbeans/modules/web/core/syntax/completion/resources/property_16.png</file>
+ <file>src/org/netbeans/modules/web/core/syntax/completion/resources/map_16.png</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/web/core/syntax/resources/ELExample</file>
+ <file>src/org/netbeans/modules/web/core/syntax/resources/JSPExample</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="GUI_USABILITY"/>
+ </fileset>
+</licenseinfo>
----------------------------------------------------------------
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