You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/22 22:55:03 UTC
svn commit: r1187778 [5/6] - in /tomcat/trunk/java/javax: annotation/
annotation/security/ ejb/ el/ persistence/ servlet/ servlet/annotation/
servlet/descriptor/ servlet/http/ servlet/jsp/ servlet/jsp/el/
servlet/jsp/resources/ servlet/jsp/tagext/ serv...
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java Sat Oct 22 20:54:57 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
import javax.servlet.jsp.JspException;
@@ -22,9 +22,9 @@ import javax.servlet.jsp.PageContext;
/**
- * The interface of a classic tag handler that does not want to manipulate
- * its body. The Tag interface defines the basic protocol between a Tag
- * handler and JSP page implementation class. It defines the life cycle
+ * The interface of a classic tag handler that does not want to manipulate
+ * its body. The Tag interface defines the basic protocol between a Tag
+ * handler and JSP page implementation class. It defines the life cycle
* and the methods to be invoked at start and end tag.
*
* <p><B>Properties</B></p>
@@ -55,11 +55,11 @@ import javax.servlet.jsp.PageContext;
* or not.
* <li> [2] This transition happens if and only if the tag ends normally
* without raising an exception
- * <li> [3] Some setters may be called again before a tag handler is
- * reused. For instance, <code>setParent()</code> is called if it's
- * reused within the same page but at a different level,
- * <code>setPageContext()</code> is called if it's used in another page,
- * and attribute setters are called if the values differ or are expressed
+ * <li> [3] Some setters may be called again before a tag handler is
+ * reused. For instance, <code>setParent()</code> is called if it's
+ * reused within the same page but at a different level,
+ * <code>setPageContext()</code> is called if it's used in another page,
+ * and attribute setters are called if the values differ or are expressed
* as request-time attribute values.
* <li> Check the TryCatchFinally interface for additional details related
* to exception handling and resource management.
@@ -67,7 +67,7 @@ import javax.servlet.jsp.PageContext;
*
* <IMG src="doc-files/TagProtocol.gif"
* alt="Lifecycle Details Transition Diagram for Tag"/>
- *
+ *
* <p>Once all invocations on the tag handler
* are completed, the release method is invoked on it. Once a release
* method is invoked <em>all</em> properties, including parent and
@@ -84,7 +84,7 @@ import javax.servlet.jsp.PageContext;
* EVAL_BODY_INCLUDE.</p>
*
* <p>If SKIP_BODY is returned the body, if present, is not evaluated.</p>
- *
+ *
* <p>If EVAL_BODY_INCLUDE is returned, the body is evaluated and
* "passed through" to the current out.</p>
*/
@@ -95,14 +95,14 @@ public interface Tag extends JspTag {
* Skip body evaluation.
* Valid return value for doStartTag and doAfterBody.
*/
-
+
public static final int SKIP_BODY = 0;
-
+
/**
* Evaluate body into existing out stream.
* Valid return value for doStartTag.
*/
-
+
public static final int EVAL_BODY_INCLUDE = 1;
/**
@@ -214,14 +214,14 @@ public interface Tag extends JspTag {
* implementing BodyTag whose doStartTag() method returns
* BodyTag.EVAL_BODY_BUFFERED.
*
- * @return EVAL_BODY_INCLUDE if the tag wants to process body, SKIP_BODY
+ * @return EVAL_BODY_INCLUDE if the tag wants to process body, SKIP_BODY
* if it does not want to process it.
* @throws JspException if an error occurred while processing this tag
* @see BodyTag
*/
-
+
int doStartTag() throws JspException;
-
+
/**
* Process the end tag for this instance.
@@ -236,7 +236,7 @@ public interface Tag extends JspTag {
* <p>
* If this method returns EVAL_PAGE, the rest of the page continues
* to be evaluated. If this method returns SKIP_PAGE, the rest of
- * the page is not evaluated, the request is completed, and
+ * the page is not evaluated, the request is completed, and
* the doEndTag() methods of enclosing tags are not invoked. If this
* request was forwarded or included from another page (or Servlet),
* only the current page evaluation is stopped.
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagAdapter.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagAdapter.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagAdapter.java Sat Oct 22 20:54:57 2011
@@ -29,7 +29,7 @@ import javax.servlet.jsp.PageContext;
* created to wrap the SimpleTag parent, and the adapter is passed to
* setParent() instead. A classic Tag Handler can call getAdaptee() to retrieve
* the encapsulated SimpleTag instance.
- *
+ *
* @since 2.0
*/
public class TagAdapter implements Tag {
@@ -45,7 +45,7 @@ public class TagAdapter implements Tag {
/**
* Creates a new TagAdapter that wraps the given SimpleTag and returns the
* parent tag when getParent() is called.
- *
+ *
* @param adaptee
* The SimpleTag being adapted as a Tag.
*/
@@ -59,7 +59,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called.
- *
+ *
* @param pc
* ignored.
* @throws UnsupportedOperationException
@@ -74,7 +74,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called. The parent of this tag is always
* getAdaptee().getParent().
- *
+ *
* @param parentTag
* ignored.
* @throws UnsupportedOperationException
@@ -91,7 +91,7 @@ public class TagAdapter implements Tag {
* This will either be the enclosing Tag (if getAdaptee().getParent()
* implements Tag), or an adapter to the enclosing Tag (if
* getAdaptee().getParent() does not implement Tag).
- *
+ *
* @return The parent of the tag being adapted.
*/
@Override
@@ -116,7 +116,7 @@ public class TagAdapter implements Tag {
* Gets the tag that is being adapted to the Tag interface. This should be
* an instance of SimpleTag in JSP 2.0, but room is left for other kinds of
* tags in future spec versions.
- *
+ *
* @return the tag that is being adapted
*/
public JspTag getAdaptee() {
@@ -125,7 +125,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called.
- *
+ *
* @return always throws UnsupportedOperationException
* @throws UnsupportedOperationException
* Must not be called
@@ -140,7 +140,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called.
- *
+ *
* @return always throws UnsupportedOperationException
* @throws UnsupportedOperationException
* Must not be called
@@ -155,7 +155,7 @@ public class TagAdapter implements Tag {
/**
* Must not be called.
- *
+ *
* @throws UnsupportedOperationException
* Must not be called
*/
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java Sat Oct 22 20:54:57 2011
@@ -20,7 +20,7 @@ package javax.servlet.jsp.tagext;
/**
* Information on the attributes of a Tag, available at translation time. This
* class is instantiated from the Tag Library Descriptor file (TLD).
- *
+ *
* <p>
* Only the information needed to generate code is included here. Other
* information like SCHEMA for validation belongs elsewhere.
@@ -38,7 +38,7 @@ public class TagAttributeInfo {
* Constructor for TagAttributeInfo. This class is to be instantiated only
* from the TagLibrary code under request from some JSP code that is parsing
* a TLD (Tag Library Descriptor).
- *
+ *
* @param name
* The name of the attribute.
* @param required
@@ -58,7 +58,7 @@ public class TagAttributeInfo {
* JSP 2.0 Constructor for TagAttributeInfo. This class is to be
* instantiated only from the TagLibrary code under request from some JSP
* code that is parsing a TLD (Tag Library Descriptor).
- *
+ *
* @param name
* The name of the attribute.
* @param required
@@ -69,7 +69,7 @@ public class TagAttributeInfo {
* Whether this attribute holds a request-time Attribute.
* @param fragment
* Whether this attribute is of type JspFragment
- *
+ *
* @since 2.0
*/
@@ -99,7 +99,7 @@ public class TagAttributeInfo {
/**
* The name of this attribute.
- *
+ *
* @return the name of the attribute
*/
@@ -109,7 +109,7 @@ public class TagAttributeInfo {
/**
* The type (as a String) of this attribute.
- *
+ *
* @return the type of the attribute
*/
@@ -119,7 +119,7 @@ public class TagAttributeInfo {
/**
* Whether this attribute can hold a request-time value.
- *
+ *
* @return if the attribute can hold a request-time value.
*/
@@ -129,7 +129,7 @@ public class TagAttributeInfo {
/**
* Whether this attribute is required.
- *
+ *
* @return if the attribute is required.
*/
public boolean isRequired() {
@@ -139,7 +139,7 @@ public class TagAttributeInfo {
/**
* Convenience static method that goes through an array of TagAttributeInfo
* objects and looks for "id".
- *
+ *
* @param a
* An array of TagAttributeInfo
* @return The TagAttributeInfo reference with name "id"
@@ -155,9 +155,9 @@ public class TagAttributeInfo {
/**
* Whether this attribute is of type JspFragment.
- *
+ *
* @return if the attribute is of type JspFragment
- *
+ *
* @since 2.0
*/
public boolean isFragment() {
@@ -167,7 +167,7 @@ public class TagAttributeInfo {
/**
* Returns a String representation of this TagAttributeInfo, suitable for
* debugging purposes.
- *
+ *
* @return a String representation of this TagAttributeInfo
*/
@Override
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java Sat Oct 22 20:54:57 2011
@@ -23,8 +23,8 @@ import java.util.Hashtable;
* The (translation-time only) attribute/value information for a tag instance.
*
* <p>
- * TagData is only used as an argument to the isValid, validate, and
- * getVariableInfo methods of TagExtraInfo, which are invoked at
+ * TagData is only used as an argument to the isValid, validate, and
+ * getVariableInfo methods of TagExtraInfo, which are invoked at
* translation time.
*/
@@ -72,7 +72,7 @@ public class TagData implements Cloneabl
* Constructor for a TagData.
*
* If you already have the attributes in a hashtable, use this
- * constructor.
+ * constructor.
*
* @param attrs A hashtable to get the values from.
*/
@@ -99,9 +99,9 @@ public class TagData implements Cloneabl
* The distinguished object REQUEST_TIME_VALUE is only returned if
* the value is specified as a request-time attribute expression
* or via the <jsp:attribute> action with a body that contains
- * dynamic content (scriptlets, scripting expressions, EL expressions,
- * standard actions, or custom actions). Returns null if the attribute
- * is not set.
+ * dynamic content (scriptlets, scripting expressions, EL expressions,
+ * standard actions, or custom actions). Returns null if the attribute
+ * is not set.
*
* @param attName the name of the attribute
* @return the attribute's value
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagExtraInfo.java Sat Oct 22 20:54:57 2011
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
/**
@@ -36,7 +36,7 @@ package javax.servlet.jsp.tagext;
* object for the tag being translated. If an explicit call to
* setTagInfo() is done, then the object passed will be returned in
* subsequent calls to getTagInfo().
- *
+ *
* <p>
* The only way to affect the value returned by getTagInfo()
* is through a setTagInfo() call, and thus, TagExtraInfo.setTagInfo() is
@@ -55,13 +55,13 @@ package javax.servlet.jsp.tagext;
public abstract class TagExtraInfo {
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public TagExtraInfo() {
// NOOP by default
}
-
+
/**
* information on scripting variables defined by the tag associated with
* this TagExtraInfo instance.
@@ -76,7 +76,7 @@ public abstract class TagExtraInfo {
}
/**
- * Translation-time validation of the attributes.
+ * Translation-time validation of the attributes.
* Request-time attributes are indicated as such in the TagData parameter.
* Note that the preferred way to do validation is with the validate()
* method, since it can return more detailed information.
@@ -93,17 +93,17 @@ public abstract class TagExtraInfo {
/**
* Translation-time validation of the attributes.
* Request-time attributes are indicated as such in the TagData parameter.
- * Because of the higher quality validation messages possible,
- * this is the preferred way to do validation (although isValid()
- * still works).
- *
+ * Because of the higher quality validation messages possible,
+ * this is the preferred way to do validation (although isValid()
+ * still works).
+ *
* <p>JSP 2.0 and higher containers call validate() instead of isValid().
- * The default implementation of this method is to call isValid(). If
+ * The default implementation of this method is to call isValid(). If
* isValid() returns false, a generic ValidationMessage[] is returned
* indicating isValid() returned false.</p>
*
* @param data The TagData instance.
- * @return A null object, or zero length array if no errors, an
+ * @return A null object, or zero length array if no errors, an
* array of ValidationMessages otherwise.
* @since 2.0
*/
@@ -135,7 +135,7 @@ public abstract class TagExtraInfo {
public final TagInfo getTagInfo() {
return tagInfo;
}
-
+
// private data
private TagInfo tagInfo;
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java Sat Oct 22 20:54:57 2011
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
/**
@@ -39,7 +39,7 @@ public class TagFileInfo {
* design error, which may be fixed in the future.
*
* @param name The unique action name of this tag
- * @param path Where to find the .tag file implementing this
+ * @param path Where to find the .tag file implementing this
* action, relative to the location of the TLD file.
* @param tagInfo The detailed information about this tag, as parsed
* from the directives in the tag file.
@@ -62,7 +62,7 @@ public class TagFileInfo {
/**
* Where to find the .tag file implementing this action.
*
- * @return The path of the tag file, relative to the TLD, or "." if
+ * @return The path of the tag file, relative to the TLD, or "." if
* the tag file was defined in an implicit tag file.
*/
public String getPath() {
@@ -70,7 +70,7 @@ public class TagFileInfo {
}
/**
- * Returns information about this tag, parsed from the directives
+ * Returns information about this tag, parsed from the directives
* in the tag file.
*
* @return a TagInfo object containing information about this tag
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java Sat Oct 22 20:54:57 2011
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
/**
@@ -23,7 +23,7 @@ package javax.servlet.jsp.tagext;
* This class is instantiated from the Tag Library Descriptor file (TLD)
* and is available only at translation time.
*
- *
+ *
*/
public class TagInfo {
@@ -46,12 +46,12 @@ public class TagInfo {
*/
public static final String BODY_CONTENT_EMPTY = "empty";
-
+
/**
* Static constant for getBodyContent() when it is scriptless.
- *
+ *
* @since 2.0
- */
+ */
public static final String BODY_CONTENT_SCRIPTLESS = "scriptless";
/**
@@ -93,7 +93,7 @@ public class TagInfo {
if (tagExtraInfo != null)
tagExtraInfo.setTagInfo(this);
}
-
+
/**
* Constructor for TagInfo from data in the JSP 1.2 format for TLD.
* This class is to be instantiated only from the TagLibrary code
@@ -144,7 +144,7 @@ public class TagInfo {
if (tagExtraInfo != null)
tagExtraInfo.setTagInfo(this);
}
-
+
/**
* Constructor for TagInfo from data in the JSP 2.0 format for TLD.
* This class is to be instantiated only from the TagLibrary code
@@ -243,7 +243,7 @@ public class TagInfo {
}
/**
- * Translation-time validation of the attributes.
+ * Translation-time validation of the attributes.
* This is a convenience method on the associated TagExtraInfo class.
*
* @param data The translation-time TagData instance.
@@ -276,7 +276,7 @@ public class TagInfo {
/**
* Set the instance for extra tag information.
- *
+ *
* @param tei the TagExtraInfo instance
*/
public void setTagExtraInfo(TagExtraInfo tei) {
@@ -286,7 +286,7 @@ public class TagInfo {
/**
* The instance (if any) for extra tag information.
- *
+ *
* @return The TagExtraInfo instance, if any.
*/
public TagExtraInfo getTagExtraInfo() {
@@ -299,7 +299,7 @@ public class TagInfo {
*
* @return The name of the tag handler class.
*/
-
+
public String getTagClassName() {
return tagClassName;
}
@@ -321,7 +321,7 @@ public class TagInfo {
/**
* The information string for the tag.
*
- * @return the info string, or null if
+ * @return the info string, or null if
* not defined
*/
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java Sat Oct 22 20:54:57 2011
@@ -27,7 +27,7 @@ public abstract class TagLibraryInfo {
/**
* Constructor. This will invoke the constructors for TagInfo, and
* TagAttributeInfo after parsing the TLD file.
- *
+ *
* @param prefix
* the prefix actually used by the taglib directive
* @param uri
@@ -43,7 +43,7 @@ public abstract class TagLibraryInfo {
/**
* The value of the uri attribute from the taglib directive for this
* library.
- *
+ *
* @return the value of the uri attribute
*/
public String getURI() {
@@ -52,7 +52,7 @@ public abstract class TagLibraryInfo {
/**
* The prefix assigned to this taglib from the taglib directive
- *
+ *
* @return the prefix assigned to this taglib from the taglib directive
*/
public String getPrefixString() {
@@ -65,7 +65,7 @@ public abstract class TagLibraryInfo {
* The preferred short name (prefix) as indicated in the TLD. This may be
* used by authoring tools as the preferred prefix to use when creating an
* taglib directive for this library.
- *
+ *
* @return the preferred short name for the library
*/
public String getShortName() {
@@ -76,7 +76,7 @@ public abstract class TagLibraryInfo {
* The "reliable" URN indicated in the TLD (the uri element). This may be
* used by authoring tools as a global identifier to use when creating a
* taglib directive for this library.
- *
+ *
* @return a reliable URN to a TLD like this
*/
public String getReliableURN() {
@@ -85,7 +85,7 @@ public abstract class TagLibraryInfo {
/**
* Information (documentation) for this TLD.
- *
+ *
* @return the info string for this tag lib
*/
public String getInfoString() {
@@ -94,7 +94,7 @@ public abstract class TagLibraryInfo {
/**
* A string describing the required version of the JSP container.
- *
+ *
* @return the (minimal) required version of the JSP container.
* @see javax.servlet.jsp.JspEngineInfo
*/
@@ -104,7 +104,7 @@ public abstract class TagLibraryInfo {
/**
* An array describing the tags that are defined in this tag library.
- *
+ *
* @return the TagInfo objects corresponding to the tags defined by this tag
* library, or a zero length array if this tag library defines no
* tags
@@ -115,7 +115,7 @@ public abstract class TagLibraryInfo {
/**
* An array describing the tag files that are defined in this tag library.
- *
+ *
* @return the TagFileInfo objects corresponding to the tag files defined by
* this tag library, or a zero length array if this tag library
* defines no tags files
@@ -128,7 +128,7 @@ public abstract class TagLibraryInfo {
/**
* Get the TagInfo for a given tag name, looking through all the tags in
* this tag library.
- *
+ *
* @param shortname
* The short name (no prefix) of the tag
* @return the TagInfo for the tag with the specified short name, or null if
@@ -152,7 +152,7 @@ public abstract class TagLibraryInfo {
/**
* Get the TagFileInfo for a given tag name, looking through all the tag
* files in this tag library.
- *
+ *
* @param shortname
* The short name (no prefix) of the tag
* @return the TagFileInfo for the specified Tag file, or null if no Tag
@@ -176,7 +176,7 @@ public abstract class TagLibraryInfo {
/**
* An array describing the functions that are defined in this tag library.
- *
+ *
* @return the functions defined in this tag library, or a zero length array
* if the tag library defines no functions.
* @since 2.0
@@ -188,7 +188,7 @@ public abstract class TagLibraryInfo {
/**
* Get the FunctionInfo for a given function name, looking through all the
* functions in this tag library.
- *
+ *
* @param name
* The name (no prefix) of the function
* @return the FunctionInfo for the function with the given name, or null if
@@ -216,7 +216,7 @@ public abstract class TagLibraryInfo {
* If a tag library is imported more than once and bound to different
* prefixes, only the TagLibraryInfo bound to the first prefix must be
* included in the returned array.
- *
+ *
* @return Array of TagLibraryInfo objects representing the entire set of
* tag libraries (including this TagLibraryInfo) imported by taglib
* directives in the translation unit that references this
@@ -245,14 +245,14 @@ public abstract class TagLibraryInfo {
/**
* An array describing the tag files that are defined in this tag library.
- *
+ *
* @since 2.0
*/
protected TagFileInfo[] tagFiles;
/**
* An array describing the functions that are defined in this tag library.
- *
+ *
* @since 2.0
*/
protected FunctionInfo[] functions;
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryValidator.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryValidator.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryValidator.java Sat Oct 22 20:54:57 2011
@@ -20,7 +20,7 @@ package javax.servlet.jsp.tagext;
import java.util.Map;
/**
- * Translation-time validator class for a JSP page.
+ * Translation-time validator class for a JSP page.
* A validator operates on the XML view associated with the JSP page.
*
* <p>
@@ -40,12 +40,12 @@ import java.util.Map;
* be invoked, where the first two arguments are the prefix
* and uri for this tag library in the XML View. The prefix is intended
* to make it easier to produce an error message. However, it is not
- * always accurate. In the case where a single URI is mapped to more
+ * always accurate. In the case where a single URI is mapped to more
* than one prefix in the XML view, the prefix of the first URI is provided.
- * Therefore, to provide high quality error messages in cases where the
- * tag elements themselves are checked, the prefix parameter should be
- * ignored and the actual prefix of the element should be used instead.
- * TagLibraryValidators should always use the uri to identify elements
+ * Therefore, to provide high quality error messages in cases where the
+ * tag elements themselves are checked, the prefix parameter should be
+ * ignored and the actual prefix of the element should be used instead.
+ * TagLibraryValidators should always use the uri to identify elements
* as beloning to the tag library, not the prefix.
*
* <p>
@@ -73,7 +73,7 @@ import java.util.Map;
* of an error.
*
* <p>
- * The actual prefix of the <code>id</code> attribute may or may not be
+ * The actual prefix of the <code>id</code> attribute may or may not be
* <code>jsp</code> but it will always map to the namespace
* <code>http://java.sun.com/JSP/Page</code>. A TagLibraryValidator
* implementation must rely on the uri, not the prefix, of the <code>id</code>
@@ -83,13 +83,13 @@ import java.util.Map;
public abstract class TagLibraryValidator {
/**
- * Sole constructor. (For invocation by subclass constructors,
+ * Sole constructor. (For invocation by subclass constructors,
* typically implicit.)
*/
public TagLibraryValidator() {
// NOOP by default
}
-
+
/**
* Set the init data in the TLD for this validator.
* Parameter names are keys, and parameter values are the values.
@@ -118,15 +118,15 @@ public abstract class TagLibraryValidato
* the method should return an array of ValidationMessage objects.
* An array of length zero is also interpreted as no errors.
*
- * @param prefix the first prefix with which the tag library is
- * associated, in the XML view. Note that some tags may use
+ * @param prefix the first prefix with which the tag library is
+ * associated, in the XML view. Note that some tags may use
* a different prefix if the namespace is redefined.
* @param uri the tag library's unique identifier
* @param page the JspData page object
* @return A null object, or zero length array if no errors, an array
* of ValidationMessages otherwise.
*/
- public ValidationMessage[] validate(String prefix, String uri,
+ public ValidationMessage[] validate(String prefix, String uri,
PageData page) {
return null;
}
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java Sat Oct 22 20:54:57 2011
@@ -34,7 +34,7 @@ import javax.servlet.jsp.PageContext;
* facilitate coordination among cooperating tags.
*
* <p> Many tag handlers will extend TagSupport and only redefine a
- * few methods.
+ * few methods.
*/
public class TagSupport implements IterationTag, Serializable {
@@ -66,7 +66,7 @@ public class TagSupport implements Itera
* should adhere to that constraint. Specifically, the Class
* passed to findAncestorWithClass should be a subtype of the
* observable type.
- *
+ *
*
* @param from The instance from where to start looking.
* @param klass The subclass of Tag or interface to be matched
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagVariableInfo.java Sat Oct 22 20:54:57 2011
@@ -26,7 +26,7 @@ public class TagVariableInfo {
/**
* Constructor for TagVariableInfo.
- *
+ *
* @param nameGiven
* value of <name-given>
* @param nameFromAttribute
@@ -49,7 +49,7 @@ public class TagVariableInfo {
/**
* The body of the <name-given> element.
- *
+ *
* @return The variable name as a constant
*/
public String getNameGiven() {
@@ -61,7 +61,7 @@ public class TagVariableInfo {
* an attribute whose (translation-time) value will give the name of the
* variable. One of <name-given> or <name-from-attribute> is
* required.
- *
+ *
* @return The attribute whose value defines the variable name
*/
public String getNameFromAttribute() {
@@ -70,7 +70,7 @@ public class TagVariableInfo {
/**
* The body of the <variable-class> element.
- *
+ *
* @return The name of the class of the variable or 'java.lang.String' if
* not defined in the TLD.
*/
@@ -80,7 +80,7 @@ public class TagVariableInfo {
/**
* The body of the <declare> element.
- *
+ *
* @return Whether the variable is to be declared or not. If not defined in
* the TLD, 'true' will be returned.
*/
@@ -90,7 +90,7 @@ public class TagVariableInfo {
/**
* The body of the <scope> element.
- *
+ *
* @return The scope to give the variable. NESTED scope will be returned if
* not defined in the TLD.
*/
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TryCatchFinally.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TryCatchFinally.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TryCatchFinally.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TryCatchFinally.java Sat Oct 22 20:54:57 2011
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-
+
package javax.servlet.jsp.tagext;
@@ -33,7 +33,7 @@ package javax.servlet.jsp.tagext;
* h.setPageContext(pc); // initialize as desired
* h.setParent(null);
* h.setFoo("foo");
- *
+ *
* // tag invocation protocol; see Tag.java
* try {
* doStartTag()...
@@ -46,7 +46,7 @@ package javax.servlet.jsp.tagext;
* // restore data invariants and release per-invocation resources
* h.doFinally();
* }
- *
+ *
* ... other invocations perhaps with some new setters
* ...
* h.release(); // release long-term resources
@@ -72,10 +72,10 @@ public interface TryCatchFinally {
* condition.
*
* @param t The throwable exception navigating through this tag.
- * @throws Throwable if the exception is to be rethrown further up
+ * @throws Throwable if the exception is to be rethrown further up
* the nest chain.
*/
-
+
void doCatch(Throwable t) throws Throwable;
/**
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/ValidationMessage.java Sat Oct 22 20:54:57 2011
@@ -42,7 +42,7 @@ public class ValidationMessage {
* element, or if no jsp:id attributes were passed on. If non-null, the
* value of id must be the value of a jsp:id attribute for the PageData
* passed into the validate() method.
- *
+ *
* @param id
* Either null, or the value of a jsp:id attribute.
* @param message
@@ -55,7 +55,7 @@ public class ValidationMessage {
/**
* Get the jsp:id. Null means that there is no information available.
- *
+ *
* @return The jsp:id information.
*/
public String getId() {
@@ -64,7 +64,7 @@ public class ValidationMessage {
/**
* Get the localized validation message.
- *
+ *
* @return A validation message
*/
public String getMessage() {
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java Sat Oct 22 20:54:57 2011
@@ -187,7 +187,7 @@ public class VariableInfo {
/**
* Constructor These objects can be created (at translation time) by the
* TagExtraInfo instances.
- *
+ *
* @param varName
* The name of the scripting variable
* @param className
@@ -210,7 +210,7 @@ public class VariableInfo {
/**
* Returns the name of the scripting variable.
- *
+ *
* @return the name of the scripting variable
*/
public String getVarName() {
@@ -219,7 +219,7 @@ public class VariableInfo {
/**
* Returns the type of this variable.
- *
+ *
* @return the type of this variable
*/
public String getClassName() {
@@ -229,7 +229,7 @@ public class VariableInfo {
/**
* Returns whether this is a new variable. If so, in some languages this
* will require a declaration.
- *
+ *
* @return whether this is a new variable.
*/
public boolean getDeclare() {
@@ -238,7 +238,7 @@ public class VariableInfo {
/**
* Returns the lexical scope of the variable.
- *
+ *
* @return the lexical scope of the variable, either AT_BEGIN, AT_END, or
* NESTED.
* @see #AT_BEGIN
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/package.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/package.html?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/package.html (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/package.html Sat Oct 22 20:54:57 2011
@@ -29,10 +29,10 @@ mechanism for the description of tag lib
A JSP tag library contains
<ul>
<li>A Tag Library Descriptor</li>
-<li>A number of Tag Files or Tag handler classes defining
+<li>A number of Tag Files or Tag handler classes defining
request-time behavior</li>
<li>Additional classes and resources used at runtime</li>
-<li>Possibly some additional classes to provide extra translation
+<li>Possibly some additional classes to provide extra translation
information</li>
</ul>
<p>
Modified: tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/trunk/java/javax/servlet/resources/datatypes.dtd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/datatypes.dtd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd Sat Oct 22 20:54:57 2011
@@ -9,7 +9,7 @@
<xsd:documentation>
$Id$
-
+
</xsd:documentation>
</xsd:annotation>
@@ -17,9 +17,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
+
Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-
+
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
@@ -29,7 +29,7 @@
glassfish/bootstrap/legal/LICENSE.txt. 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
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -39,9 +39,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
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
@@ -53,7 +53,7 @@
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.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -70,20 +70,20 @@
The following definitions that appear in the common
shareable schema(s) of Java EE deployment descriptors should be
interpreted with respect to the context they are included:
-
+
Deployment Component may indicate one of the following:
java ee application;
application client;
web application;
enterprise bean;
- resource adapter;
-
+ resource adapter;
+
Deployment File may indicate one of the following:
ear file;
war file;
jar file;
rar file;
-
+
</xsd:documentation>
</xsd:annotation>
@@ -98,10 +98,10 @@
This group keeps the usage of the contained description related
elements consistent across Java EE deployment descriptors.
-
+
All elements may occur multiple times with different languages,
to support localization of the content.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -126,7 +126,7 @@
This group keeps the usage of the contained JNDI environment
reference elements consistent across Java EE deployment descriptors.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -184,7 +184,7 @@
This group collects elements that are common to most
JNDI resource elements.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -196,7 +196,7 @@
<xsd:documentation>
The JNDI name to be looked up to resolve a resource reference.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -210,7 +210,7 @@
This group collects elements that are common to all the
JNDI resource elements. It does not include the lookup-name
element, that is only applicable to some resource elements.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -229,13 +229,13 @@
names to names of resources known to the application
server. This mapped name is often a global JNDI name,
but may be a name of any form.
-
+
Application servers are not required to support any
particular form or type of mapped name, nor the ability
to use mapped names. The mapped name is
product-dependent and often installation-dependent. No
use of a mapped name is portable.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -254,7 +254,7 @@
<xsd:documentation>
Configuration of a DataSource.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -265,7 +265,7 @@
<xsd:documentation>
Description of this DataSource.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -276,7 +276,7 @@
The name element specifies the JNDI name of the
data source being defined.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -288,7 +288,7 @@
DataSource, XADataSource or ConnectionPoolDataSource
implementation class.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -299,7 +299,7 @@
<xsd:documentation>
Database server name.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -310,7 +310,7 @@
<xsd:documentation>
Port number where a server is listening for requests.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -321,7 +321,7 @@
<xsd:documentation>
Name of a database on a server.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -336,7 +336,7 @@
such as <code>serverName</code>, <code>databaseName</code>
and <code>portNumber</code>, the more specific properties will
take precedence and <code>url</code> will be ignored.
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -348,7 +348,7 @@
<xsd:documentation>
User name to use for connection authentication.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -359,7 +359,7 @@
<xsd:documentation>
Password to use for connection authentication.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -372,7 +372,7 @@
JDBC DataSource property. This may be a vendor-specific
property or a less commonly used DataSource property.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -384,7 +384,7 @@
Sets the maximum time in seconds that this data source
will wait while attempting to connect to a database.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -396,7 +396,7 @@
Set to false if connections should not participate in
transactions.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -407,7 +407,7 @@
<xsd:documentation>
Isolation level for connections.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -419,7 +419,7 @@
Number of connections that should be created when a
connection pool is initialized.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -431,7 +431,7 @@
Maximum number of connections that should be concurrently
allocated for a connection pool.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -443,7 +443,7 @@
Minimum number of connections that should be concurrently
allocated for a connection pool.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -456,7 +456,7 @@
The number of seconds that a physical connection should
remain unused in the pool before the connection is
closed for a connection pool.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -468,7 +468,7 @@
The total number of statements that a connection pool
should keep open.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -493,10 +493,10 @@
tools used by such a Deployment File consumer will display
the description when processing the parent element that
contains the description.
-
+
The lang attribute defines the language that the
- description is provided in. The default value is "en" (English).
-
+ description is provided in. The default value is "en" (English).
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -511,8 +511,8 @@
<xsd:documentation>
This type defines a dewey decimal that is used
- to describe versions of documents.
-
+ to describe versions of documents.
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
@@ -530,16 +530,16 @@
The display-name type contains a short name that is intended
to be displayed by tools. It is used by display-name
elements. The display name need not be unique.
-
- Example:
-
+
+ Example:
+
...
<display-name xml:lang="en">
Employee Self Service
</display-name>
-
- The value of the xml:lang attribute is "en" (English) by default.
-
+
+ The value of the xml:lang attribute is "en" (English) by default.
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -560,11 +560,11 @@
The ejb-linkType is used by ejb-link
elements in the ejb-ref or ejb-local-ref elements to specify
that an EJB reference is linked to enterprise bean.
-
+
The value of the ejb-link element must be the ejb-name of an
enterprise bean in the same ejb-jar file or in another ejb-jar
- file in the same Java EE application unit.
-
+ file in the same Java EE application unit.
+
Alternatively, the name in the ejb-link element may be
composed of a path name specifying the ejb-jar containing the
referenced enterprise bean with the ejb-name of the target
@@ -573,13 +573,13 @@
Deployment Component that is referencing the enterprise
bean. This allows multiple enterprise beans with the same
ejb-name to be uniquely identified.
-
+
Examples:
-
+
<ejb-link>EmployeeRecord</ejb-link>
-
+
<ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -599,22 +599,22 @@
the declaration of a reference to an enterprise bean's local
home or to the local business interface of a 3.0 bean.
The declaration consists of:
-
+
- an optional description
- - the EJB reference name used in the code of the Deployment
+ - the EJB reference name used in the code of the Deployment
Component that's referencing the enterprise bean.
- the optional expected type of the referenced enterprise bean
- - the optional expected local interface of the referenced
- enterprise bean or the local business interface of the
+ - the optional expected local interface of the referenced
+ enterprise bean or the local business interface of the
referenced enterprise bean.
- - the optional expected local home interface of the referenced
+ - the optional expected local home interface of the referenced
enterprise bean. Not applicable if this ejb-local-ref refers
to the local business interface of a 3.0 bean.
- - optional ejb-link information, used to specify the
+ - optional ejb-link information, used to specify the
referenced enterprise bean
- - optional elements to define injection of the named enterprise
+ - optional elements to define injection of the named enterprise
bean into a component field or property.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -654,13 +654,13 @@
Deployment Component's environment and is relative to the
java:comp/env context. The name must be unique within the
Deployment Component.
-
+
It is recommended that name is prefixed with "ejb/".
-
+
Example:
-
+
<ejb-ref-name>ejb/Payroll</ejb-ref-name>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -678,25 +678,25 @@
The ejb-refType is used by ejb-ref elements for the
declaration of a reference to an enterprise bean's home or
- to the remote business interface of a 3.0 bean.
+ to the remote business interface of a 3.0 bean.
The declaration consists of:
-
+
- an optional description
- the EJB reference name used in the code of
the Deployment Component that's referencing the enterprise
- bean.
+ bean.
- the optional expected type of the referenced enterprise bean
- the optional remote interface of the referenced enterprise bean
- or the remote business interface of the referenced enterprise
+ or the remote business interface of the referenced enterprise
bean
- - the optional expected home interface of the referenced
+ - the optional expected home interface of the referenced
enterprise bean. Not applicable if this ejb-ref
refers to the remote business interface of a 3.0 bean.
- optional ejb-link information, used to specify the
referenced enterprise bean
- optional elements to define injection of the named enterprise
bean into a component field or property
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -733,13 +733,13 @@
The ejb-ref-typeType contains the expected type of the
referenced enterprise bean.
-
+
The ejb-ref-type designates a value
that must be one of the following:
-
+
Entity
Session
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -758,8 +758,8 @@
<xsd:documentation>
This type is used to designate an empty
- element when used.
-
+ element when used.
+
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id"
@@ -778,21 +778,21 @@
description, the name of the environment entry, a type
(optional if the value is injected, otherwise required), and
an optional value.
-
+
It also includes optional elements to define injection of
the named resource into fields or JavaBeans properties.
-
+
If a value is not specified and injection is requested,
no injection will occur and no entry of the specified name
will be created. This allows an initial value to be
specified in the source code without being incorrectly
changed when no override has been specified.
-
+
If a value is not specified and no injection is requested,
- a value must be supplied during deployment.
-
+ a value must be supplied during deployment.
+
This type is used by env-entry elements.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -808,15 +808,15 @@
The env-entry-name element contains the name of a
Deployment Component's environment entry. The name
is a JNDI name relative to the java:comp/env
- context. The name must be unique within a
+ context. The name must be unique within a
Deployment Component. The uniqueness
constraints must be defined within the declared
context.
-
+
Example:
-
+
<env-entry-name>minAmount</env-entry-name>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -833,11 +833,11 @@
be omitted, or must match the type of the injection
target. If no injection target is specified, the type
is required.
-
+
Example:
-
+
<env-entry-type>java.lang.Integer</env-entry-type>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -854,11 +854,11 @@
constructor of the specified type that takes a
single String parameter, or for java.lang.Character,
a single character.
-
+
Example:
-
+
<env-entry-value>100.00</env-entry-value>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -879,9 +879,9 @@
This type contains the fully-qualified Java type of the
environment entry value that is expected by the
application's code.
-
+
The following are the legal values of env-entry-type-valuesType:
-
+
java.lang.Boolean
java.lang.Byte
java.lang.Character
@@ -893,13 +893,13 @@
java.lang.Double
java.lang.Class
any enumeration type (i.e. a subclass of java.lang.Enum)
-
+
Examples:
-
+
<env-entry-type>java.lang.Boolean</env-entry-type>
<env-entry-type>java.lang.Class</env-entry-type>
<env-entry-type>com.example.Color</env-entry-type>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -921,7 +921,7 @@
of name used in Class.forName(). Tools that need the
canonical name (the name used in source code) will need
to convert this binary name to the canonical name.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -937,9 +937,9 @@
<xsd:documentation>
This type defines four different values which can designate
- boolean values. This includes values yes and no which are
+ boolean values. This includes values yes and no which are
not designated by xsd:boolean
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -962,12 +962,12 @@
The icon type contains small-icon and large-icon elements
that specify the file names for small and large GIF, JPEG,
or PNG icon images used to represent the parent element in a
- GUI tool.
-
+ GUI tool.
+
The xml:lang attribute defines the language that the
icon file names are provided in. Its value is "en" (English)
- by default.
-
+ by default.
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -981,14 +981,14 @@
containing a small (16 x 16) icon image. The file
name is a relative path within the Deployment
Component's Deployment File.
-
+
The image may be in the GIF, JPEG, or PNG format.
The icon can be used by tools.
-
+
Example:
-
+
<small-icon>employee-service-icon16x16.jpg</small-icon>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1001,17 +1001,17 @@
<![CDATA[[
The large-icon element contains the name of a file
containing a large
- (32 x 32) icon image. The file name is a relative
+ (32 x 32) icon image. The file name is a relative
path within the Deployment Component's Deployment
File.
-
+
The image may be in the GIF, JPEG, or PNG format.
The icon can be used by tools.
-
+
Example:
-
+
<large-icon>employee-service-icon32x32.jpg</large-icon>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1031,22 +1031,22 @@
An injection target specifies a class and a name within
that class into which a resource should be injected.
-
+
The injection target class specifies the fully qualified
class name that is the target of the injection. The
Java EE specifications describe which classes can be an
injection target.
-
+
The injection target name specifies the target within
the specified class. The target is first looked for as a
JavaBeans property name. If not found, the target is
looked for as a field name.
-
+
The specified resource will be injected into the target
during initialization of the class by either calling the
set method for the target property or by setting a value
into the named field.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1067,7 +1067,7 @@
TRANSACTION_READ_COMMITTED
TRANSACTION_REPEATABLE_READ
TRANSACTION_SERIALIZABLE
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
@@ -1086,9 +1086,9 @@
<xsd:documentation>
The java-identifierType defines a Java identifier.
- The users of this type should further verify that
+ The users of this type should further verify that
the content does not contain Java reserved keywords.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1108,7 +1108,7 @@
This is a generic type that designates a Java primitive
type or a fully qualified name of a Java interface/type,
or an array of such types.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1128,13 +1128,13 @@
The jdbc-urlType contains the url pattern of the mapping.
It must follow the rules specified in Section 9.3 of the
JDBC Specification where the format is:
-
+
jdbc:<subprotocol>:<subname>
-
+
Example:
-
+
<url>jdbc:mysql://localhost:3307/testdb</url>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1156,7 +1156,7 @@
Deployment Component's environment and is relative to the
java:comp/env context. A JNDI name must be unique within the
Deployment Component.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1172,12 +1172,12 @@
<xsd:documentation>
<![CDATA[[
The homeType defines the fully-qualified name of
- an enterprise bean's home interface.
-
+ an enterprise bean's home interface.
+
Example:
-
+
<home>com.aardvark.payroll.PayrollHome</home>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1198,12 +1198,12 @@
Note that each class may have only one lifecycle callback
method for any given event and that the method may not
be overloaded.
-
+
If the lifefycle-callback-class element is missing then
the class defining the callback is assumed to be the
component class in scope at the place in the descriptor
in which the callback definition appears.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1224,7 +1224,7 @@
The listenerType indicates the deployment properties for a web
application listener bean.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1238,7 +1238,7 @@
application must be registered as a web
application listener bean. The value is the fully
qualified classname of the listener class.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1256,7 +1256,7 @@
The localType defines the fully-qualified name of an
enterprise bean's local interface.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1273,7 +1273,7 @@
The local-homeType defines the fully-qualified
name of an enterprise bean's local home interface.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1290,7 +1290,7 @@
This type is a general type that can be used to declare
parameter/value lists.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1305,7 +1305,7 @@
The param-name element contains the name of a
parameter.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1316,7 +1316,7 @@
The param-value element contains the value of a
parameter.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1334,7 +1334,7 @@
The elements that use this type designate either a relative
path or an absolute path starting with a "/".
-
+
In elements that specify a pathname to a file within the
same Deployment File, relative filenames (i.e., those not
starting with "/") are considered relative to the root of
@@ -1343,7 +1343,7 @@
the Deployment File's namespace. In general, relative names
are preferred. The exception is .war files where absolute
names are preferred for consistency with the Servlet API.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1362,7 +1362,7 @@
of Deployment Component's reference to a persistence context
associated within a Deployment Component's
environment. It consists of:
-
+
- an optional description
- the persistence context reference name
- an optional persistence unit name. If not specified,
@@ -1372,14 +1372,14 @@
Extended. If not specified, Transaction is assumed.
- an optional list of persistence properties
- optional injection targets
-
+
Examples:
-
+
<persistence-context-ref>
<persistence-context-ref-name>myPersistenceContext
</persistence-context-ref-name>
</persistence-context-ref>
-
+
<persistence-context-ref>
<persistence-context-ref-name>myPersistenceContext
</persistence-context-ref-name>
@@ -1387,7 +1387,7 @@
</persistence-unit-name>
<persistence-context-type>Extended</persistence-context-type>
</persistence-context-ref>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1406,7 +1406,7 @@
value is the environment entry name used in
Deployment Component code. The name is a JNDI name
relative to the java:comp/env context.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1419,16 +1419,16 @@
The Application Assembler(or BeanProvider) may use the
following syntax to avoid the need to rename persistence
units to have unique names within a Java EE application.
-
+
The Application Assembler specifies the pathname of the
root of the persistence.xml file for the referenced
persistence unit and appends the name of the persistence
unit separated from the pathname by #. The pathname is
- relative to the referencing application component jar file.
+ relative to the referencing application component jar file.
In this manner, multiple persistence units with the same
- persistence unit name may be uniquely identified when the
+ persistence unit name may be uniquely identified when the
Application Assembler cannot change persistence unit names.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1445,11 +1445,11 @@
Used to specify properties for the container or persistence
provider. Vendor-specific properties may be included in
the set of properties. Properties that are not recognized
- by a vendor must be ignored. Entries that make use of the
+ by a vendor must be ignored. Entries that make use of the
namespace javax.persistence and its subnamespaces must not
be used for vendor-specific properties. The namespace
javax.persistence is reserved for use by the specification.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1467,13 +1467,13 @@
<xsd:documentation>
The persistence-context-typeType specifies the transactional
- nature of a persistence context reference.
-
+ nature of a persistence context reference.
+
The value of the persistence-context-type element must be
one of the following:
Transaction
Extended
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1492,7 +1492,7 @@
<xsd:documentation>
Specifies a name/value pair.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1518,27 +1518,27 @@
of Deployment Component's reference to a persistence unit
associated within a Deployment Component's
environment. It consists of:
-
+
- an optional description
- the persistence unit reference name
- an optional persistence unit name. If not specified,
the default persistence unit is assumed.
- optional injection targets
-
+
Examples:
-
+
<persistence-unit-ref>
<persistence-unit-ref-name>myPersistenceUnit
</persistence-unit-ref-name>
</persistence-unit-ref>
-
+
<persistence-unit-ref>
<persistence-unit-ref-name>myPersistenceUnit
</persistence-unit-ref-name>
<persistence-unit-name>PersistenceUnit1
</persistence-unit-name>
</persistence-unit-ref>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1557,7 +1557,7 @@
value is the environment entry name used in
Deployment Component code. The name is a JNDI name
relative to the java:comp/env context.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1570,16 +1570,16 @@
The Application Assembler(or BeanProvider) may use the
following syntax to avoid the need to rename persistence
units to have unique names within a Java EE application.
-
+
The Application Assembler specifies the pathname of the
root of the persistence.xml file for the referenced
persistence unit and appends the name of the persistence
unit separated from the pathname by #. The pathname is
- relative to the referencing application component jar file.
+ relative to the referencing application component jar file.
In this manner, multiple persistence units with the same
- persistence unit name may be uniquely identified when the
+ persistence unit name may be uniquely identified when the
Application Assembler cannot change persistence unit names.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1598,11 +1598,11 @@
<![CDATA[[
The remote element contains the fully-qualified name
of the enterprise bean's remote interface.
-
+
Example:
-
+
<remote>com.wombat.empl.EmployeeService</remote>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1626,25 +1626,25 @@
resource environment reference name, and an optional
indication of the resource environment reference type
expected by the Deployment Component code.
-
+
It also includes optional elements to define injection of
the named resource into fields or JavaBeans properties.
-
+
The resource environment type must be supplied unless an
injection target is specified, in which case the type
of the target is used. If both are specified, the type
must be assignment compatible with the type of the injection
target.
-
+
Example:
-
+
<resource-env-ref>
<resource-env-ref-name>jms/StockQueue
</resource-env-ref-name>
<resource-env-ref-type>javax.jms.Queue
</resource-env-ref-type>
</resource-env-ref>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1661,10 +1661,10 @@
The resource-env-ref-name element specifies the name
of a resource environment reference; its value is
the environment entry name used in
- the Deployment Component code. The name is a JNDI
- name relative to the java:comp/env context and must
+ the Deployment Component code. The name is a JNDI
+ name relative to the java:comp/env context and must
be unique within a Deployment Component.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1678,7 +1678,7 @@
of a resource environment reference. It is the
fully qualified name of a Java language class or
interface.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1704,25 +1704,25 @@
(Application or Container), and an optional specification of
the shareability of connections obtained from the resource
(Shareable or Unshareable).
-
+
It also includes optional elements to define injection of
the named resource into fields or JavaBeans properties.
-
+
The connection factory type must be supplied unless an
injection target is specified, in which case the type
of the target is used. If both are specified, the type
must be assignment compatible with the type of the injection
target.
-
+
Example:
-
+
<resource-ref>
<res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1739,9 +1739,9 @@
The res-ref-name element specifies the name of a
resource manager connection factory reference.
The name is a JNDI name relative to the
- java:comp/env context.
- The name must be unique within a Deployment File.
-
+ java:comp/env context.
+ The name must be unique within a Deployment File.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1755,7 +1755,7 @@
source. The type is specified by the fully qualified
Java language class or interface
expected to be implemented by the data source.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1784,12 +1784,12 @@
on behalf of the Deployment Component. In the latter case,
the Container uses information that is supplied by the
Deployer.
-
+
The value must be one of the two following:
-
+
Application
Container
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1811,12 +1811,12 @@
obtained through the given resource manager connection
factory reference can be shared. The value, if specified,
must be one of the two following:
-
+
Shareable
Unshareable
-
+
The default value is Shareable.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1835,9 +1835,9 @@
<xsd:documentation>
The run-asType specifies the run-as identity to be
- used for the execution of a component. It contains an
+ used for the execution of a component. It contains an
optional description, and the name of a security role.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1860,9 +1860,9 @@
<xsd:documentation>
The role-nameType designates the name of a security role.
-
+
The name must conform to the lexical rules for a token.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1880,9 +1880,9 @@
The security-roleType contains the definition of a security
role. The definition consists of an optional description of
the security role, and the security role name.
-
+
Example:
-
+
<security-role>
<description>
This role includes all employees who are authorized
@@ -1890,7 +1890,7 @@
</description>
<role-name>employee</role-name>
</security-role>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1920,7 +1920,7 @@
code, and an optional link to a security role. If the
security role is not specified, the Deployer must choose an
appropriate security role.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1934,10 +1934,10 @@
<xsd:documentation>
The value of the role-name element must be the String used
- as the parameter to the
+ as the parameter to the
EJBContext.isCallerInRole(String roleName) method or the
HttpServletRequest.isUserInRole(String role) method.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1951,7 +1951,7 @@
security role. The role-link element must contain
the name of one of the security roles defined in the
security-role elements.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1968,7 +1968,7 @@
<xsd:documentation>
This type adds an "id" attribute to xsd:QName.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1987,7 +1987,7 @@
<xsd:documentation>
This type adds an "id" attribute to xsd:boolean.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2006,7 +2006,7 @@
<xsd:documentation>
This type adds an "id" attribute to xsd:NMTOKEN.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2025,7 +2025,7 @@
<xsd:documentation>
This type adds an "id" attribute to xsd:anyURI.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2044,7 +2044,7 @@
<xsd:documentation>
This type adds an "id" attribute to xsd:integer.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2063,7 +2063,7 @@
<xsd:documentation>
This type adds an "id" attribute to xsd:positiveInteger.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2082,7 +2082,7 @@
<xsd:documentation>
This type adds an "id" attribute to xsd:nonNegativeInteger.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2101,7 +2101,7 @@
<xsd:documentation>
This type adds an "id" attribute to xsd:string.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2124,7 +2124,7 @@
require trailing/leading space elimination as well as
collapsing the existing whitespace, this base type may be
used.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2144,10 +2144,10 @@
This simple type designates a boolean with only two
permissible values
-
+
- true
- false
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2171,7 +2171,7 @@
If it contains those characters, the container must inform
the developer with a descriptive error message.
The container must preserve all characters including whitespaces.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2189,25 +2189,25 @@
The message-destinationType specifies a message
destination. The logical destination described by this
element is mapped to a physical destination by the Deployer.
-
- The message destination element contains:
-
+
+ The message destination element contains:
+
- an optional description
- an optional display-name
- an optional icon
- a message destination name which must be unique
- among message destination names within the same
- Deployment File.
+ among message destination names within the same
+ Deployment File.
- an optional mapped name
- an optional lookup name
-
- Example:
-
+
+ Example:
+
<message-destination>
<message-destination-name>CorporateStocks
</message-destination-name>
</message-destination>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -2222,7 +2222,7 @@
name for a message destination. This name must be
unique among the names of message destinations
within the Deployment File.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -2236,19 +2236,19 @@
should be mapped to. Each message-destination-ref
element that references this message destination will
define a name in the namespace of the referencing
- component or in one of the other predefined namespaces.
+ component or in one of the other predefined namespaces.
Many application servers provide a way to map these
local names to names of resources known to the
application server. This mapped name is often a global
JNDI name, but may be a name of any form. Each of the
local names should be mapped to this same global name.
-
+
Application servers are not required to support any
particular form or type of mapped name, nor the ability
to use mapped names. The mapped name is
product-dependent and often installation-dependent. No
use of a mapped name is portable.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -2259,7 +2259,7 @@
<xsd:documentation>
The JNDI name to be looked up to resolve the message destination.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -2279,25 +2279,25 @@
of Deployment Component's reference to a message destination
associated with a resource in Deployment Component's
environment. It consists of:
-
+
- an optional description
- the message destination reference name
- an optional message destination type
- an optional specification as to whether
- the destination is used for
+ the destination is used for
consuming or producing messages, or both.
if not specified, "both" is assumed.
- an optional link to the message destination
- optional injection targets
-
+
The message destination type must be supplied unless an
injection target is specified, in which case the type
of the target is used. If both are specified, the type
must be assignment compatible with the type of the injection
target.
-
+
Examples:
-
+
<message-destination-ref>
<message-destination-ref-name>jms/StockQueue
</message-destination-ref-name>
@@ -2308,7 +2308,7 @@
<message-destination-link>CorporateStocks
</message-destination-link>
</message-destination-ref>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -2326,7 +2326,7 @@
the name of a message destination reference; its
value is the environment entry name used in
Deployment Component code.
-
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -2358,13 +2358,13 @@
destination, produced for the destination, or both. The
Assembler makes use of this information in linking producers
of a destination with its consumers.
-
+
The value of the message-destination-usage element must be
one of the following:
Consumes
Produces
ConsumesProduces
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2386,12 +2386,12 @@
The message-destination-typeType specifies the type of
the destination. The type is specified by the Java interface
expected to be implemented by the destination.
-
- Example:
-
+
+ Example:
+
<message-destination-type>javax.jms.Queue
</message-destination-type>
-
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -2410,14 +2410,14 @@
The message-destination-linkType is used to link a message
destination reference or message-driven bean to a message
destination.
-
+
The Assembler sets the value to reflect the flow of messages
between producers and consumers in the application.
-
+
The value must be the message-destination-name of a message
destination in the same Deployment File or in another
Deployment File in the same Java EE application unit.
-
+
Alternatively, the value may be composed of a path name
specifying a Deployment File containing the referenced
message destination with the message-destination-name of the
@@ -2426,7 +2426,7 @@
containing Deployment Component that is referencing the
message destination. This allows multiple message
destinations with the same name to be uniquely identified.
-
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org