You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2018/08/22 17:17:03 UTC
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module
Review web.core
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 aa0977e [NETBEANS-1074] Module Review web.core
aa0977e is described below
commit aa0977ea2409491b4034cef6a64a7b51787ac2b7
Author: Gilberto Caetano de Andrade <gi...@gmail.com>
AuthorDate: Wed Aug 22 14:17:00 2018 -0300
[NETBEANS-1074] Module Review web.core
* Add missing license headers
* Add media files to licenseinfo.xml
* Replaced DTD files by ones with ALv2 equivalent - from Tomcat project:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_33/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_33/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd
---
web.core/external/binaries-list | 16 ++++
web.core/licenseinfo.xml | 86 ++++++++++++++++++++++
.../web/core/resources/web-jsptaglibrary_1_1.dtd | 60 +++++++++------
.../web/core/resources/web-jsptaglibrary_1_2.dtd | 64 ++++++++++------
4 files changed, 180 insertions(+), 46 deletions(-)
diff --git a/web.core/external/binaries-list b/web.core/external/binaries-list
index b338428..32e2d6c 100644
--- a/web.core/external/binaries-list
+++ b/web.core/external/binaries-list
@@ -1,2 +1,18 @@
+# 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.
01A7A41F32178515A507D5FEB2F6F68EA2DE3409 web.core-glassfish-ext-resources.zip
8A5E82903633C964D66E28964E7D7C4C1F924FB2 web.core-w3c-ext-resources.zip
diff --git a/web.core/licenseinfo.xml b/web.core/licenseinfo.xml
new file mode 100644
index 0000000..8de1c43
--- /dev/null
+++ b/web.core/licenseinfo.xml
@@ -0,0 +1,86 @@
+<?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/taglib/resources/TaglibCatalog.gif</file>
+ <file>src/org/netbeans/modules/web/taglib/resources/tag.gif</file>
+ <file>src/org/netbeans/modules/web/taglib/resources/tags.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/jspObject32.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/xml_error_glyph.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/tag.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/servletSettings.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/badge_error.png</file>
+ <file>src/org/netbeans/modules/web/core/resources/servletSettings32.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/jspObject.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/jsp-fragment16.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/jsp-xml16.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/tag16.gif</file>
+ <file>src/org/netbeans/modules/web/core/resources/jsp16.gif</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Report16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/ForEach16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Query16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/UseBean16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/GetProperty16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/GetProperty32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/If32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/If16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/SetProperty16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Update16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/UseBean32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Delete16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Insert16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Choose16.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/ForEach32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Report32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Update32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Delete32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/SetProperty32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Query32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Choose32.png</file>
+ <file>src/org/netbeans/modules/web/core/palette/items/resources/Insert32.png</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/web/core/resources/templates/AdvancedFilter.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/BlankTagLibrary.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/BlankTagLibrary_1_2.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/BlankTagLibrary_2_0.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/BodyTagHandler.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/JSP.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/JSPDoc.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/JSPDocX.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/JSPF.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/Servlet.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/ServletListener.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/SimpleFilter.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/SimpleTagHandler.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/TagFile.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/TagFileF.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/TagFileFX.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/TagFileX.template</file>
+ <file>src/org/netbeans/modules/web/core/resources/templates/WebModule.template</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="TEMPLATE_MINIMAL_IP" />
+ </fileset>
+
+</licenseinfo>
diff --git a/web.core/src/org/netbeans/modules/web/core/resources/web-jsptaglibrary_1_1.dtd b/web.core/src/org/netbeans/modules/web/core/resources/web-jsptaglibrary_1_1.dtd
index b1705a1..47cdf06 100644
--- a/web.core/src/org/netbeans/modules/web/core/resources/web-jsptaglibrary_1_1.dtd
+++ b/web.core/src/org/netbeans/modules/web/core/resources/web-jsptaglibrary_1_1.dtd
@@ -1,4 +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 the DTD defining the JavaServer Pages 1.1 Tag Library
descriptor (.tld) (XML) file format/syntax.
@@ -14,22 +30,22 @@
<!--
The taglib tag is the document root, it defines:
-tlibversion the version of the tag library implementation
-jspversion the version of JSP the tag library depends upon
+tlibversion the version of the tag library implementation
+jspversion the version of JSP the tag library depends upon
-shortname a simple default short name that could be used by
- a JSP authoring tool to create names with a mnemonic
- value; for example, the it may be used as the prefered
- prefix value in taglib directives
-uri a uri uniquely identifying this taglib
-info a simple string describing the "use" of this taglib,
- should be user discernable
+shortname a simple default short name that could be used by
+ a JSP authoring tool to create names with a mnemonic
+ value; for example, the it may be used as the preferred
+ prefix value in taglib directives
+uri a uri uniquely identifying this taglib
+info a simple string describing the "use" of this taglib,
+ should be user discernable
-->
<!ELEMENT taglib (tlibversion, jspversion?, shortname, uri?, info?, tag+) >
<!ATTLIST taglib id ID #IMPLIED
- xmlns CDATA #FIXED
- "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"
+ xmlns CDATA #FIXED
+ "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"
>
<!--
@@ -59,20 +75,20 @@ white space, and do not start with digits or underscore.
#PCDATA ::= NMTOKEN
-->
-<!ELEMENT shortname (#PCDATA) >
+<!ELEMENT shortname (#PCDATA) >
<!--
Defines a public URI that uniquely identifies this version of
the taglibrary Leave it empty if it does not apply.
-->
-<!ELEMENT uri (#PCDATA) >
+<!ELEMENT uri (#PCDATA) >
<!--
-Defines an arbitrary text string descirbing the tag library
+Defines an arbitrary text string describing the tag library
-->
-<!ELEMENT info (#PCDATA) >
+<!ELEMENT info (#PCDATA) >
<!--
The tag defines a unique tag in this tag library, defining:
@@ -88,7 +104,7 @@ The tag defines a unique tag in this tag library, defining:
<!ELEMENT tag (name, tagclass, teiclass?, bodycontent?, info?, attribute*) >
<!--
-Defines the subclass of javax.serlvet.jsp.tagext.Tag that implements
+Defines the subclass of javax.servlet.jsp.tagext.Tag that implements
the request time semantics for this tag. (required)
#PCDATA ::= fully qualified Java class name
@@ -113,13 +129,13 @@ intended for use by page composition tools.
There are currently three values specified:
-tagdependent The body of the tag is interpreted by the tag
- implementation itself, and is most likely in a
- different "langage", e.g embedded SQL statements.
+tagdependent The body of the tag is interpreted by the tag
+ implementation itself, and is most likely in a
+ different "language", e.g embedded SQL statements.
-JSP The body of the tag contains nested JSP syntax
+JSP The body of the tag contains nested JSP syntax
-empty The body must be empty
+empty The body must be empty
The default (if not defined) is JSP
@@ -149,7 +165,7 @@ Defines the canonical name of a tag or attribute being defined
#PCDATA ::= NMTOKEN
-->
-<!ELEMENT name (#PCDATA) >
+<!ELEMENT name (#PCDATA) >
<!--
Defines if the nesting attribute is required or optional.
diff --git a/web.core/src/org/netbeans/modules/web/core/resources/web-jsptaglibrary_1_2.dtd b/web.core/src/org/netbeans/modules/web/core/resources/web-jsptaglibrary_1_2.dtd
index 369f41e..da8d1a7 100644
--- a/web.core/src/org/netbeans/modules/web/core/resources/web-jsptaglibrary_1_2.dtd
+++ b/web.core/src/org/netbeans/modules/web/core/resources/web-jsptaglibrary_1_2.dtd
@@ -1,4 +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 the DTD defining the JavaServer Pages 1.2 Tag Library
descriptor (.tld) (XML) file format/syntax.
@@ -21,23 +37,23 @@ of the following form:
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-->
<!--
The taglib tag is the document root, it defines:
-tlib-version the version of the tag library implementation
+tlib-version the version of the tag library implementation
-jsp-version the version of JSP the tag library depends upon
+jsp-version the version of JSP the tag library depends upon
-short-name a simple default short name that could be used by
- a JSP authoring tool to create names with a mnemonic
- value; for example, the it may be used as the prefered
- prefix value in taglib directives
+short-name a simple default short name that could be used by
+ a JSP authoring tool to create names with a mnemonic
+ value; for example, the it may be used as the preferred
+ prefix value in taglib directives
-uri a uri uniquely identifying this taglib
+uri a uri uniquely identifying this taglib
display-name the display-name element contains a short name that
is intended to be displayed by tools
@@ -45,8 +61,8 @@ small-icon optional small-icon that can be used by tools
large-icon optional large-icon that can be used by tools
-description a simple string describing the "use" of this taglib,
- should be user discernable
+description a simple string describing the "use" of this taglib,
+ should be user discernable
validator optional TagLibraryValidator information
@@ -60,8 +76,8 @@ listener optional event listener specification
validator?, listener*, tag+) >
<!ATTLIST taglib id ID #IMPLIED
- xmlns CDATA #FIXED
- "http://java.sun.com/JSP/TagLibraryDescriptor"
+ xmlns CDATA #FIXED
+ "http://java.sun.com/JSP/TagLibraryDescriptor"
>
<!--
@@ -98,13 +114,13 @@ Defines a public URI that uniquely identifies this version of
the taglibrary. Leave it empty if it does not apply.
-->
-<!ELEMENT uri (#PCDATA) >
+<!ELEMENT uri (#PCDATA) >
<!--
-Defines an arbitrary text string descirbing the tag library
+Defines an arbitrary text string describing the tag library
-->
-<!ELEMENT description (#PCDATA) >
+<!ELEMENT description (#PCDATA) >
<!--
@@ -204,7 +220,7 @@ example Optional informal description of an example of a
example?) >
<!--
-Defines the subclass of javax.serlvet.jsp.tagext.Tag that implements
+Defines the subclass of javax.servlet.jsp.tagext.Tag that implements
the request time semantics for this tag. (required)
#PCDATA ::= fully qualified Java class name
@@ -229,13 +245,13 @@ intended for use by page composition tools.
There are currently three values specified:
-tagdependent The body of the tag is interpreted by the tag
- implementation itself, and is most likely in a
- different "langage", e.g embedded SQL statements.
+tagdependent The body of the tag is interpreted by the tag
+ implementation itself, and is most likely in a
+ different "language", e.g embedded SQL statements.
-JSP The body of the tag contains nested JSP syntax
+JSP The body of the tag contains nested JSP syntax
-empty The body must be empty
+empty The body must be empty
The default (if not defined) is JSP
@@ -306,7 +322,7 @@ variable-class Name of the class of the variable.
declare Whether the variable is declared or not.
True is the default.
-scope The scope of the scripting varaible
+scope The scope of the scripting variable
defined. NESTED is default.
description Optional description of this variable
@@ -364,7 +380,7 @@ values are "AT_BEGIN" and "AT_END".
The attribute tag defines an attribute for the nesting tag
An attribute definition is composed of:
-
+
- the attributes name (required)
- if the attribute is required or optional (optional)
- if the attributes value may be dynamically calculated at runtime
@@ -400,7 +416,7 @@ Defines the canonical name of a tag or attribute being defined
#PCDATA ::= NMTOKEN
-->
-<!ELEMENT name (#PCDATA) >
+<!ELEMENT name (#PCDATA) >
<!--
Defines if the nesting attribute is required or optional.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists