You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by ba...@apache.org on 2009/05/17 18:46:10 UTC

svn commit: r775709 - /jakarta/taglibs/proper/jndi/trunk/src/main/resources/META-INF/taglibs-jndi.tld

Author: bayard
Date: Sun May 17 16:46:10 2009
New Revision: 775709

URL: http://svn.apache.org/viewvc?rev=775709&view=rev
Log:
Removing restriction from tld by putting text into description - and removing availability

Modified:
    jakarta/taglibs/proper/jndi/trunk/src/main/resources/META-INF/taglibs-jndi.tld

Modified: jakarta/taglibs/proper/jndi/trunk/src/main/resources/META-INF/taglibs-jndi.tld
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/jndi/trunk/src/main/resources/META-INF/taglibs-jndi.tld?rev=775709&r1=775708&r2=775709&view=diff
==============================================================================
--- jakarta/taglibs/proper/jndi/trunk/src/main/resources/META-INF/taglibs-jndi.tld (original)
+++ jakarta/taglibs/proper/jndi/trunk/src/main/resources/META-INF/taglibs-jndi.tld Sun May 17 16:46:10 2009
@@ -43,11 +43,6 @@
         <li>note: as of right now this does not look into the id and scope to see if the 
         context already exists, so it does not behave entirely like useBean</li>
         </ul>
-      </description>
-
-      <summary>Create a javax.naming.Context object for use after tag close.</summary>
-      <availability>1.0</availability>
-      <restrictions>
         One of the following three attributes must be specified:
         <ul>
         <li>env</li>
@@ -61,7 +56,9 @@
         <li>providerUrl</li>
         <li>url</li>
         </ul>
-      </restrictions>
+      </description>
+
+      <summary>Create a javax.naming.Context object for use after tag close.</summary>
 
       <attribute>
         <name>envRef</name>
@@ -72,7 +69,6 @@
           additional environment information.  This info is subordinate to the info
           provided by the attributes to this tag.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>env</name>
@@ -81,7 +77,6 @@
         <description>
           Same as envRef, except that the value is of type java.util.Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>url</name>       
@@ -93,7 +88,6 @@
           preform a lookup(String) operation.  The context returned from the lookup
           will be the context returned by the tag.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>providerUrl</name>
@@ -103,7 +97,6 @@
           Provides the value of the Context.PROVIDER_URL attribute to the 
           InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>initialFactory</name>
@@ -113,7 +106,6 @@
           Provides the value of the Context.INITIAL_CONTEXT_FACTORY attribute to 
           the InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>dnsUrl</name>
@@ -123,7 +115,6 @@
           Provides the value of the Context.DNS_URL attribute to the 
           InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>authoritative</name>
@@ -133,7 +124,6 @@
           Provides the value of the Context.AUTHORITATIVE attribute to the 
           InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>batchsize</name>
@@ -143,7 +133,6 @@
           Provides the value of the Context.BATCHSIZE attribute to the 
           InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>objectFactories</name>
@@ -153,7 +142,6 @@
           Provides the value of the Context.OBJECT_FACTORIES attribute to 
           the InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>stateFactories</name>
@@ -163,7 +151,6 @@
           Provides the value of the Context.STATE_FACTORIES attribute to 
           the InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>urlPkgPrefixes</name>
@@ -173,7 +160,6 @@
           Provides the value of the Context.URL_PKG_PREFIXES attribute to 
           the InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>id</name>
@@ -184,7 +170,6 @@
           (A potential future relaxation may make this optional, but it will only
           be available to body content enclosed that asks for an implicit context)
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>scope</name>
@@ -194,7 +179,6 @@
           The scope the object is to be exported as.  Default is 'page'.
           Follows the JSP spec conventions.
         </description>
-        <availability>1.0</availability>
       </attribute>
     </tag>
   
@@ -209,17 +193,14 @@
       <description>
        This tag iterates through the list returned by Context.list() and
        the body content is evaluated for each iteration.
-      </description>
-
-      <summary>Lists the elements in a particular javax.naming.Context</summary>
-      <availability>1.0</availability>
-      <restrictions>
         One of the following two attributes must be specified:
         <ul>
         <li>context</li>
         <li>contextRef</li>
         </ul>
-      </restrictions>
+      </description>
+
+      <summary>Lists the elements in a particular javax.naming.Context</summary>
 
       <attribute>
         <name>contextRef</name>
@@ -228,7 +209,6 @@
         <description>
           Attribute name that will be searched for to provide the context.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>context</name>
@@ -237,7 +217,6 @@
         <description>
           A literal instance of type javax.naming.Context to be used.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>nameId</name>
@@ -246,7 +225,6 @@
         <description>
           The attribute name of the name listing to be exported
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>nameScope</name>
@@ -255,7 +233,6 @@
         <description>
           The scope that the name object will be exported to (page is the default).
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>classId</name>
@@ -264,7 +241,6 @@
         <description>
           The attribute name of the class name to be exported.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>classScope</name>
@@ -273,7 +249,6 @@
         <description>
           The scope that the class name will be exported to (page is the default).
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>objId</name>
@@ -282,7 +257,6 @@
         <description>
           The attribute name of the bound object listing to be exported.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>objScope</name>
@@ -291,7 +265,6 @@
         <description>
           The scope that the bound object will be exported to (page is the default).
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>name</name>
@@ -300,7 +273,6 @@
         <description>
           The name to preform the list against.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>nameObject</name>
@@ -311,7 +283,6 @@
           and name are specified and the value is not null, this attribute is 
           the one used.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>bindings</name>
@@ -320,7 +291,6 @@
         <description>
           Whether or not bound objects are returned, <b>true</b> or <b>false</b>.
         </description>
-        <availability>1.0</availability>
       </attribute>
     </tag>
   
@@ -334,17 +304,14 @@
 
       <description>
         Lookups and exports a particular entry in a javax.naming.Context.
-      </description>
-
-      <summary>This looks up a particular object and exports it.</summary>
-      <availability>1.0</availability>
-      <restrictions>
         One of the following two attributes must be specified:
         <ul>
         <li>context</li>
         <li>contextRef</li>
         </ul>
-      </restrictions>
+      </description>
+
+      <summary>This looks up a particular object and exports it.</summary>
 
       <attribute>
         <name>contextRef</name>
@@ -353,7 +320,6 @@
         <description>
           Attribute name that will be searched for to provide the context.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>context</name>
@@ -362,7 +328,6 @@
         <description>
           A literal instance of type javax.naming.Context to be used.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>id</name>
@@ -371,7 +336,6 @@
         <description>
           Attribute name of the object to be exported.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>scope</name>
@@ -381,7 +345,6 @@
           The scope the object is to be exported as.  Default is 'page'.
           Follows the JSP spec conventions.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>name</name>
@@ -390,7 +353,6 @@
         <description>
           The name to preform the lookup against.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>nameObject</name>
@@ -401,7 +363,6 @@
           and name are specified and the value is not null, this attribute is 
           the one used.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>type</name>
@@ -419,7 +380,6 @@
           classcast to return null, throw a JSPExceptionm or to re-throw the 
           class-cast is a thought.]
         </description>
-        <availability>1.0</availability>
       </attribute>
     </tag>
   
@@ -435,14 +395,6 @@
         This behaves exactly like useContext except that the object exported
         will be of type javax.naming.directory.DirContext and the 
         InitialDirContext will be used to generate the contexts.
-      </description>
-
-      <summary>
-        Create a javax.naming.directory.DirContext object for use
-        after tag close.
-      </summary>
-      <availability>1.0</availability>
-      <restrictions>
         One of the following three attributes must be specified:
         <ul>
         <li>env</li>
@@ -456,7 +408,12 @@
         <li>providerUrl</li>
         <li>url</li>
         </ul>
-      </restrictions>
+      </description>
+
+      <summary>
+        Create a javax.naming.directory.DirContext object for use
+        after tag close.
+      </summary>
 
       <attribute>
         <name>envRef</name>
@@ -467,7 +424,6 @@
           additional environment information.  This info is subordinate to the info
           provided by the attributes to this tag.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>env</name>
@@ -476,7 +432,6 @@
         <description>
           Same as envRef, except that the value is of type java.util.Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>url</name>
@@ -488,7 +443,6 @@
           preform a lookup(String) operation.  The context returned from the lookup
           will be the context returned by the tag.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>providerUrl</name>
@@ -498,7 +452,6 @@
           Provides the value of the Context.PROVIDER_URL attribute to the
           InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>initialFactory</name>
@@ -508,7 +461,6 @@
           Provides the value of the Context.INITIAL_CONTEXT_FACTORY attribute to
           the InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>dnsUrl</name>
@@ -518,7 +470,6 @@
           Provides the value of the Context.DNS_URL attribute to the
           InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>authoritative</name>
@@ -528,7 +479,6 @@
           Provides the value of the Context.AUTHORITATIVE attribute to the
           InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>batchsize</name>
@@ -538,7 +488,6 @@
           Provides the value of the Context.BATCHSIZE attribute to the
           InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>objectFactories</name>
@@ -548,7 +497,6 @@
           Provides the value of the Context.OBJECT_FACTORIES attribute to
           the InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>stateFactories</name>
@@ -558,7 +506,6 @@
           Provides the value of the Context.STATE_FACTORIES attribute to
           the InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>urlPkgPrefixes</name>
@@ -568,7 +515,6 @@
           Provides the value of the Context.URL_PKG_PREFIXES attribute to
           the InitialContext environment Hashtable.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>id</name>
@@ -579,7 +525,6 @@
           (A potential future relaxation may make this optional, but it will only
           be available to body content enclosed that asks for an implicit context)
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>                       
         <name>scope</name>
@@ -589,7 +534,6 @@
           The scope the object is to be exported as.  Default is 'page'.
           Follows the JSP spec conventions.                             
         </description>                                                  
-        <availability>1.0</availability>   
       </attribute>
 
     </tag>
@@ -606,17 +550,14 @@
         Performs a search against a DirContext according to the semantics
         of the search(Name name, String filter, SearchControls cons) in
         javax.naming.directory.DirContext.
-      </description>
-
-      <summary>Searches a DirContext.</summary>
-      <availability>1.0</availability>
-      <restrictions>
         One of the following two attributes must be specified:
         <ul>
         <li>context</li>
         <li>contextRef</li>
         </ul>
-      </restrictions>
+      </description>
+
+      <summary>Searches a DirContext.</summary>
 
       <attribute>
         <name>id</name>
@@ -625,7 +566,6 @@
         <description>
           Attribute name of the SearchResult  to be exported.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>scope</name>
@@ -635,7 +575,6 @@
           The scope the object is to be exported as.  Default is 'page'.
           Follows the JSP spec conventions.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>contextRef</name>
@@ -644,7 +583,6 @@
         <description>
           Attribute name that will be searched for to provide the context.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>context</name>
@@ -653,7 +591,6 @@
         <description>
           A literal instance of type javax.naming.Context to be used.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>name</name>
@@ -662,7 +599,6 @@
         <description>
           The name to preform the lookup against.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>nameObject</name>
@@ -673,7 +609,6 @@
           and name are specified and the value is not null, this attribute is 
           the one used.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>filter</name>
@@ -682,7 +617,6 @@
         <description>
           The LDAP-style search filter to use.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>countLimit</name>
@@ -693,7 +627,6 @@
           mean return all entries found (but behavior has been observerved in some
           provider/server combinations to mean none).
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>derefLink</name>
@@ -703,7 +636,6 @@
           Determines whether links will be dereferenced during the search.
           Set to <b>true</b> or <b>false</b>, default is <b>false</b>.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>attributes</name>
@@ -713,7 +645,6 @@
           A (generally) comma seperated list of attributes to return in the 
           search results.  Default is null which means return all.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>attributeSeparator</name>
@@ -723,7 +654,6 @@
           If comma seperated attributes won't do, provides an alternate 
           delimiter string for the attributes attribute.  Default is ",".
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>bindings</name>
@@ -733,7 +663,6 @@
           Whether or not to return bound objects.
           Set to <b>true</b> or <b>false</b>, default is <b>false</b>.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>searchScope</name>
@@ -744,7 +673,6 @@
           subtree_scope, onelevel, onelevel_scope, object, object_scope.  (The
           variants are treated as the the _scope variants).
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>timeLimit</name>
@@ -753,7 +681,6 @@
         <description>
           The time limit in ms to wait.  0 means wait indefinatly.
         </description>
-        <availability>1.0</availability>
       </attribute>
     </tag>
   
@@ -789,8 +716,6 @@
       </description>
 
       <summary>Extracts an attribute from a DirContext, a SearchResult, or an Attributes.</summary>
-      <availability>1.0</availability>
-      <restrictions>NONE</restrictions>
 
       <attribute>
         <name>id</name>
@@ -803,7 +728,6 @@
           value inside the body content or the final value outside the tag.  For 
           'one' it is the only value of the attribute.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>scope</name>
@@ -813,7 +737,6 @@
           The scope the object is to be exported as.  Default is 'page'.
           Follows the JSP spec conventions.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>ref</name>
@@ -823,7 +746,6 @@
           A refrence to a PageContext attribute to be searched for to use as the
           object to preform attribute operations against.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>object</name>
@@ -834,7 +756,6 @@
           applied against.  An invalid object type will result in the body content
           being skipped an no output being written to the output stream.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>attribute</name>
@@ -844,7 +765,6 @@
           The name of the attribute to use for objects of type DirContext, 
           SearchResult and Attributes.  Ignored for object of type Attribute.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>multivalue</name> <!-- either one, separator, or iterate -->
@@ -853,7 +773,6 @@
         <description>
           One of 'one', 'separator', or 'iterate'.  Se tag description for details.
         </description>
-        <availability>1.0</availability>
       </attribute>
     </tag>     
   
@@ -870,8 +789,6 @@
       </description>                                                               
 
       <summary>Iterates attributes form a DirContext, Attributes, or SearchResult.</summary>
-      <availability>1.0</availability>                                                             
-      <restrictions>NONE</restrictions>
 
       <attribute>
         <name>id</name>
@@ -882,7 +799,6 @@
           This is the name exposed within the tag Body and after.  It is the 
           Attribute object and not the value of the attribute.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>scope</name>
@@ -892,7 +808,6 @@
           The scope the object is to be exported as.  Default is 'page'.
           Follows the JSP spec conventions.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>ref</name>
@@ -903,7 +818,6 @@
           object to preform attribute operations against.  Valid types are 
           DirContext, SearchResults, and Attributes.
         </description>
-        <availability>1.0</availability>
       </attribute>
       <attribute>
         <name>object</name>
@@ -915,7 +829,6 @@
           being skipped an no output being written to the output stream.  Valid 
           types are DirContext, SearchResults, and Attributes.
         </description>
-        <availability>1.0</availability>
       </attribute>
     </tag>     
 



---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org