You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/02 19:24:33 UTC

svn commit: r165649 [5/5] - in /incubator/beehive/trunk/netui: ant/ src/bootstrap/org/apache/beehive/netui/tools/tldx/ src/tags-databinding/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/ src/tags-html/ src/tags-html/org/apache/beehive/netui/tags/divpanel/ src/tags-html/org/apache/beehive/netui/tags/html/ src/tags-html/org/apache/beehive/netui/tags/javascript/ src/tags-html/org/apache/beehive/netui/tags/tree/ src/tags-template/ src/tags-template/org/apache/beehive/netui/tags/template/ test/dist-test/

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java Mon May  2 10:24:30 2005
@@ -100,8 +100,6 @@
  *      </netui:treeItem>
  *  &lt;/netui:tree></pre>
  * @netui:tag name="tree" body-content="scriptless" description="Renders a tree control represented by a set of TreeElement objects."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.TreeRenderer" whitespace="indent"
- * requiredchild="treeItem treeHtmlAttribute treePropertyOverride"
  */
 public class Tree extends AbstractSimpleTag implements HtmlConstants,
         IAttributeConsumer, IErrorCollector
@@ -153,7 +151,6 @@
      * @param action - the action
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the action used for expanding and contracting tree nodes."
-     * @netui.tldx:attribute category="general" reftype="netui-action-url"
      */
     public void setExpansionAction(String action)
             throws JspException
@@ -167,7 +164,6 @@
      * @param action - the action
      * @netui:attribute required="true" rtexprvalue="true"
      * description="Sets the action used when a tree node is selected."
-     * @netui.tldx:attribute category="general" reftype="netui-action-url"
      */
     public void setSelectionAction(String action)
             throws JspException
@@ -191,7 +187,6 @@
      * @param target - the target for selection
      * @netui:attribute rtexprvalue="true"
      * description="Sets the frame target used for selecting tree nodes."
-     * @netui.tldx:attribute category="general" reftype="netui-action-url"
      */
     public void setSelectionTarget(String target)
     {
@@ -206,7 +201,6 @@
      * @param tagId - the tagId.
      * @netui:attribute required="true" rtexprvalue="true"
      * description="Set the id of the tree.  This appears on the containing &lt;div>."
-     * @netui.tldx:attribute category="general"
      */
     public void setTagId(String tagId)
             throws JspException
@@ -224,7 +218,6 @@
      * @netui:attribute required="false"  rtexprvalue="true"
      * description="Sets the image name for an open non-leaf node with no
      * line below it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setLastNodeExpandedImage(String lastNodeExpandedImage)
     {
@@ -244,7 +237,6 @@
      * @netui:attribute required="false"  rtexprvalue="true"
      * description="Sets the image name for an open non-leaf node with a
      * line below it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setNodeExpandedImage(String nodeExpandedImage)
     {
@@ -264,7 +256,6 @@
      * @netui:attribute required="false"  rtexprvalue="true"
      * description="Sets the image name for a closed non-leaf node with no
      * line below it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setLastNodeCollapsedImage(String lastNodeCollapsedImage)
     {
@@ -284,7 +275,6 @@
      * @netui:attribute required="false"  rtexprvalue="true"
      * description="Sets the image name for a closed non-leaf node with a
      * line below it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setNodeCollapsedImage(String nodeCollapsedImage)
     {
@@ -303,7 +293,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_imageLineLast</i>
      * @netui:attribute required="false"  rtexprvalue="true"
      * description="Sets the image name for a blank area of the tree."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setLastLineJoinImage(String lastLineJoinImage)
     {
@@ -318,7 +307,6 @@
      * @param itemIcon - the image name of the itemIcon
      * @netui:attribute required="false"  rtexprvalue="true"
      * description="Sets the default icon for TreeElements for a blank area of the tree."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setItemIcon(String itemIcon)
     {
@@ -337,7 +325,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_imageLineMiddle</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the image name for an area with a line through it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setLineJoinImage(String lineJoinImage)
     {
@@ -356,7 +343,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_imageLIneVertical</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the image name for an area with a line through it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setVerticalLineImage(String verticalLineImage)
     {
@@ -377,7 +363,6 @@
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the name of the directory containing the images for our icons,
      * and structure of the tree."
-     * @netui.tldx:attribute category="images"
      */
     public void setImageRoot(String imageRoot)
     {
@@ -395,7 +380,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_iconRoot</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the name of the directory containing the images for our icons."
-     * @netui.tldx:attribute category="images"
      */
     public void setIconRoot(String iconRoot)
     {
@@ -411,7 +395,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_rootNodeCollapsedImage</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the image representing the root when it is collapsed."
-     * @netui.tldx:attribute category="images"
      */
     public void setRootNodeCollapsedImage(String rootNodeCollapsedImage)
     {
@@ -427,7 +410,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_rootNodeExpandedImage</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the image representing the root when it is expanded."
-     * @netui.tldx:attribute category="images"
      */
     public void setRootNodeExpandedImage(String rootNodeExpandedImage)
     {
@@ -502,7 +484,6 @@
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style of a tree element when is is selected.  This results in a <code>style</code>
      * attribute being generated for this tree node."
-     * @netui.tldx:attribute category="format" propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
      */
     public void setSelectedStyle(String selectedStyle)
     {
@@ -516,7 +497,6 @@
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style class of a tree element when is is disabled.  A disabled element will have
      * a style can my be expanded/contracted, but my not be selected."
-     * @netui.tldx:attribute category="format"
      */
 
     public void setDisabledStyleClass(String disableStyleClass)
@@ -531,7 +511,6 @@
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style of a tree element when is is disabled.  A disabled element will have
      * a style can my be expanded/contracted, but my not be selected."
-     * @netui.tldx:attribute category="format" propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
      */
     public void setDisabledStyle(String disabledStyle)
     {
@@ -545,7 +524,6 @@
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style class of a tree element when is is selected.  This results in a <code>class</code>
      * attribute being generated for this tree node."
-     * @netui.tldx:attribute category="format"
      */
     public void setSelectedStyleClass(String selectedStyleClass)
     {
@@ -559,7 +537,6 @@
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style class of a tree element when is is not selected.  This results in a <code>style</code>
      * attribute being generated for this tree node."
-     * @netui.tldx:attribute category="format"  propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
      */
     public void setUnselectedStyle(String unselectedStyle)
     {
@@ -573,7 +550,6 @@
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style class of a tree element when is is selected.  This results in a <code>class</code>
      * attribute being generated for this tree node."
-     * @netui.tldx:attribute category="format"
      */
     public void setUnselectedStyleClass(String unselectedStyleClass)
     {
@@ -585,7 +561,6 @@
      * @param treeStyle - the style
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the <code>style</code> attribute of the tree."
-     * @netui.tldx:attribute category="format" propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
      */
     public void setTreeStyle(String treeStyle)
     {
@@ -598,7 +573,6 @@
      * @param treeStyleClass - the style
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the <code>class</code> attribute of the tree."
-     * @netui.tldx:attribute category="format"
      */
     public void setTreeStyleClass(String treeStyleClass)
     {
@@ -616,7 +590,6 @@
      * @netui:attribute required="true"
      * description="Sets an expression which indentifies the TreeElement that represents the root of
      * the tree."
-     * @netui.tldx:attribute language="netuiel"
      */
     public void setDataSource(String dataSource)
     {

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeContent.java Mon May  2 10:24:30 2005
@@ -26,9 +26,6 @@
 /**
  * @jsptagref.tagdescription Set the additional content that will be displayed on the right of the label of a tree.
  * @netui:tag name="treeContent" body-content="scriptless" description="Set the additional content that will be displayed on the right of the label of a tree."
- * @netui.tldx:tag requiredparent="treeItem"
- * renderer="workshop.netui.jspdesigner.tldx.TreeContentRenderer"
- * whitespace="indent"
  * @see org.apache.beehive.netui.tags.tree.Tree
  * @see org.apache.beehive.netui.tags.tree.TreeElement
  */

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeElement.java Mon May  2 10:24:30 2005
@@ -341,7 +341,6 @@
      * @param scope a String that identifies the scope in which the target page flow will be made active.
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the target scope for this anchor's URI."
-     * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
      */
     public void setScope(String scope)
     {

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeHtmlAttribute.java Mon May  2 10:24:30 2005
@@ -25,9 +25,6 @@
 /**
  * @jsptagref.tagdescription Set an attribute on the tree.
  * @netui:tag name="treeHtmlAttribute" body-content="empty" description="Set an attribute on the tree."
- * @netui.tldx:tag requiredparent="treeItem tree"
- * renderer="workshop.netui.jspdesigner.tldx.TreeHtmlAttributeRenderer"
- * whitespace="indent"
  * @see org.apache.beehive.netui.tags.tree.Tree
  * @see org.apache.beehive.netui.tags.tree.TreeElement
  */
@@ -55,7 +52,6 @@
      * @jsptagref.attributesyntaxvalue <i>string</i>
      * @netui:attribute required="true"
      * description="Sets the name of the attribute."
-     * @netui.tldx:attribute
      */
     public void setAttribute(String attr)
     {
@@ -70,7 +66,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="true"
      * description="Sets HTML attribute value."
-     * @netui.tldx:attribute
      */
     public void setValue(String value)
     {
@@ -84,7 +79,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false"
      * description="Set the attribute value on the icon."
-     * @netui.tldx:attribute
      */
     public void setOnIcon(boolean onIcon)
     {
@@ -98,7 +92,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false"
      * description="Set the attribute value on the link around the icon."
-     * @netui.tldx:attribute
      */
     public void setOnSelectionLink(boolean onSelectionLink)
     {
@@ -112,7 +105,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false"
      * description="Set the attribute value on the item div."
-     * @netui.tldx:attribute
      */
     public void setOnDiv(boolean onDiv)
     {
@@ -126,7 +118,6 @@
      * @jsptagref.attributesyntaxvalue <i>boolean</i>
      * @netui:attribute required="false"
      * description="Apply the attribute value to descendents of this node."
-     * @netui.tldx:attribute
      */
     public void setApplyToDescendents(boolean applyToDescendents)
     {

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeItem.java Mon May  2 10:24:30 2005
@@ -45,10 +45,6 @@
  * child TreeItem tags because it does not have an action and starts expanded.</p>
  * <pre>&lt;netui:treeItem label="Human Resources" icon="folder16.gif" expanded="true"></pre>
  * @netui:tag name="treeItem" body-content="scriptless" description="Instantiates a TreeElement object that will get added to the parent tag (either a Tree or another TreeItem)."
- * @netui.tldx:tag requiredparent="tree treeItem"
- * requiredchild="treeItem treeLabel treeContent treePropertyOverride"
- * renderer="workshop.netui.jspdesigner.tldx.TreeItemRenderer"
- * whitespace="indent"
  * @see Tree
  * @see org.apache.beehive.netui.tags.tree.TreeElement
  */
@@ -92,7 +88,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the TreeItem's action."
-     * @netui.tldx:attribute category="general" reftype="netui-action-url"
      */
     public void setAction(String action)
             throws JspException
@@ -108,7 +103,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets an action to run on the client when the tree is selected."
-     * @netui.tldx:attribute category="general"
      */
     public void setClientAction(String action)
             throws JspException
@@ -124,7 +118,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the ID of the tag."
-     * @netui.tldx:attribute category="general"
      */
     public void setTagId(String tagId)
             throws JspException
@@ -186,7 +179,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="sets the TreeItem's href."
-     * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
      */
     public void setHref(String href)
             throws JspException
@@ -202,7 +194,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the TreeItems title."
-     * @netui.tldx:attribute
      */
     public void setTitle(String title)
     {
@@ -225,7 +216,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the target scope for this tree node's URI."
-     * @netui.tldx:attribute
      */
     public void setScope(String scope)
     {
@@ -240,7 +230,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the icon representing this tree item."
-     * @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
      */
     public void setIcon(String icon)
     {

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeLabel.java Mon May  2 10:24:30 2005
@@ -26,9 +26,6 @@
 /**
  * @jsptagref.tagdescription Set the label for the parent tree node (a {link: TreeItem} tag).
  * @netui:tag name="treeLabel"  body-content="scriptless" description="Set the label for the parent TreeItem."
- * @netui.tldx:tag requiredparent="treeItem"
- * renderer="workshop.netui.jspdesigner.tldx.TreeLabelRenderer"
- * whitespace="indent"
  * @see org.apache.beehive.netui.tags.tree.Tree
  * @see org.apache.beehive.netui.tags.tree.TreeElement
  */

Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java (original)
+++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java Mon May  2 10:24:30 2005
@@ -26,7 +26,6 @@
  * 
  * @jsptagref.tagdescription Overrides the tree properties.
  * @netui:tag name="treePropertyOverride" body-content="empty" description="Overrides the tree properties"
- * @netui.tldx:tag whitespace="indent"
  */
 public class TreePropertyOverride extends AbstractSimpleTag
 {
@@ -49,7 +48,6 @@
      * @jsptagref.attributesyntaxvalue <i>string</i>
      * @netui:attribute required="false"
      * description="Sets the action used for expanding and contracting tree nodes."
-     * @netui.tldx:attribute category="general" reftype="netui-action-url"
      */
     public void setSelectionAction(String action)
     {
@@ -64,7 +62,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_or_expression</i>
      * @netui:attribute required="false"
      * description="Sets the action used for expanding and contracting tree nodes."
-     * @netui.tldx:attribute category="general" reftype="netui-action-url"
      */
     public void setExpansionAction(String action)
     {
@@ -82,7 +79,6 @@
      * @netui:attribute required="false"
      * description="Sets the image name for an open non-leaf node with no
      * line below it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setLastNodeExpandedImage(String lastNodeExpandedImage)
     {
@@ -100,7 +96,6 @@
      * @netui:attribute required="false"
      * description="Sets the image name for an open non-leaf node with a
      * line below it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setNodeExpandedImage(String nodeExpandedImage)
     {
@@ -118,7 +113,6 @@
      * @netui:attribute required="false"
      * description="Sets the image name for a closed non-leaf node with no
      * line below it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setLastNodeCollapsedImage(String lastNodeCollapsedImage)
     {
@@ -136,7 +130,6 @@
      * @netui:attribute required="false"
      * description="Sets the image name for a closed non-leaf node with a
      * line below it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setNodeCollapsedImage(String nodeCollapsedImage)
     {
@@ -153,7 +146,6 @@
      * @jsptagref.attributesyntaxvalue <i>string</i>
      * @netui:attribute required="false"
      * description="Sets the image name for a blank area of the tree."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setLastLineJoinImage(String lastLineJoinImage)
     {
@@ -170,7 +162,6 @@
      * @jsptagref.attributesyntaxvalue <i>string</i>
      * @netui:attribute required="false"
      * description="Sets the default icon for TreeElements for a blank area of the tree."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setItemIcon(String itemIcon)
     {
@@ -187,7 +178,6 @@
      * @jsptagref.attributesyntaxvalue <i>string</i>
      * @netui:attribute required="false"
      * description="Sets the image name for an area with a line through it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setLineJoinImage(String lineJoinImage)
     {
@@ -204,7 +194,6 @@
      * @jsptagref.attributesyntaxvalue <i>string</i>
      * @netui:attribute required="false"
      * description="Sets the image name for an area with a line through it."
-     * @netui.tldx:attribute category="images" reftype="img-url"
      */
     public void setVerticalLineImage(String verticalLineImage)
     {
@@ -222,7 +211,6 @@
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the name of the directory containing the images for our icons,
      * relative to the page including this tag."
-     * @netui.tldx:attribute category="images"
      */
     public void setImageRoot(String imageRoot)
     {
@@ -240,7 +228,6 @@
      * @jsptagref.attributesyntaxvalue <i>string_iconRoot</i>
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the name of the directory containing the images for our icons."
-     * @netui.tldx:attribute category="images"
      */
     public void setIconRoot(String iconRoot)
     {

Modified: incubator/beehive/trunk/netui/src/tags-template/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/build.xml?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-template/build.xml Mon May  2 10:24:30 2005
@@ -39,7 +39,7 @@
             <fileset dir="${module.dir}" includes="**/*.properties"/>
         </copy>
 
-        <echo>Generate TLD and TLDx</echo>
+        <echo>Generate TLD</echo>
         <taskdef name="webdoclet" classname="xdoclet.modules.web.WebDocletTask" classpathref="webdoclet.dependency.path"/>
         <webdoclet
                 destdir="${build.lib.dir}"
@@ -66,16 +66,7 @@
                  validateXml="true"
                  packageName="org.apache.beehive.netui.tags.template"
             />
- 
-            <netuitldxgen
-                     xmlencoding="UTF-8"
-		     paletteGenerator="workshop.netui.jspdesigner.generators.NetuiTemplatePaletteGenerator"
-                     uri="http://beehive.apache.org/netui/tags-template-1.0"
-                     tldxVersion="1.0"
-                     filename="${netui-tags-template.tldx.name}"
-                     packageName="org.apache.beehive.netui.tags.template"
-            />
-        </webdoclet>
+         </webdoclet>
 
         <jar jarfile="${build.lib.dir}/${tags-template.jar.name}">
             <fileset dir="${classes.dir}/${module.name}"> 
@@ -99,7 +90,6 @@
         <delete dir="${classes.dir}/${module.name}"/>
         <delete dir="${build.lib.dir}/${tags-template.jar.name}"/>
         <delete dir="${build.lib.dir}/${netui-tags-template.tld.name}"/>
-        <delete dir="${build.lib.dir}/${netui-tags-template.tldx.name}"/>
     </target>
 
 </project>

Modified: incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Attribute.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Attribute.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Attribute.java (original)
+++ incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Attribute.java Mon May  2 10:24:30 2005
@@ -93,9 +93,7 @@
  * 
  * <pre>    &lt;td colspan="3" bgcolor="lightgreen"></pre>
  *    
- * @netui:tag name="attribute"
- *          description="Place this tag in a template file, and then set its value with the netui-template:setAttribute tag."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.AttributeRenderer"
+ * @netui:tag name="attribute" description="Place this tag in a template file, and then set its value with the netui-template:setAttribute tag."
  */
 public class
         Attribute extends TagSupport

Modified: incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java (original)
+++ incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/IncludeSection.java Mon May  2 10:24:30 2005
@@ -109,7 +109,6 @@
  *    
  * @netui:tag name="includeSection"
  *          description="Include this tag in a template file to mark out content that will be used in another JSP page."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.IncludeSectionRenderer" whitespace="indent"
  */
 public class IncludeSection extends AbstractClassicTag
         implements TemplateConstants

Modified: incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java (original)
+++ incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Section.java Mon May  2 10:24:30 2005
@@ -119,7 +119,6 @@
  *    
  * @netui:tag name="section"
  *          description="Use this tag to mark out content to replace a netui-template:includeSection within a template file."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.SectionRenderer" requiredparent="template divPanel repeater"
  */
 public class Section extends AbstractClassicTag
         implements TemplateConstants

Modified: incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/SetAttribute.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/SetAttribute.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/SetAttribute.java (original)
+++ incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/SetAttribute.java Mon May  2 10:24:30 2005
@@ -96,7 +96,6 @@
  *    
  * @netui:tag name="setAttribute"
  *          description="Use this tag to set the value of an netui-template:attribute element in a template file."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.SetAttributeRenderer" requiredparent="template"
  */
 public class SetAttribute extends AbstractClassicTag
         implements TemplateConstants
@@ -153,7 +152,6 @@
      *
      * @netui:attribute required="true" rtexprvalue="true"
      * description="Sets the value of the attribute."
-     * @netui.tldx:attribute 
      */
     public void setValue(String value)
         throws JspException {

Modified: incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Template.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Template.java?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Template.java (original)
+++ incubator/beehive/trunk/netui/src/tags-template/org/apache/beehive/netui/tags/template/Template.java Mon May  2 10:24:30 2005
@@ -89,7 +89,6 @@
  *    
  * @netui:tag name="template"
  *          description="Use this tag to associate a JSP page with a particular template file."
- * @netui.tldx:tag renderer="workshop.netui.jspdesigner.tldx.TemplateRenderer" requiredchild="section setAttribute" whitespace="indent"
  */
 public class Template extends AbstractClassicTag
         implements TemplateConstants, IErrorReporter

Modified: incubator/beehive/trunk/netui/test/dist-test/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/build.xml?rev=165649&r1=165648&r2=165649&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/build.xml (original)
+++ incubator/beehive/trunk/netui/test/dist-test/build.xml Mon May  2 10:24:30 2005
@@ -87,11 +87,6 @@
              <fileset dir="${app.dir}/jsf/testRecorder/tests-myfaces"/>
         </copy>
 
-       <!-- Get the tldx for other purpose -->
-       <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/tldx">
-            <fileset dir="${build.dir}/lib" includes="*.tldx"/>
-       </copy>
-    	
        <!-- Get jsf resources -->
        <copy todir="${test.dist.base.dir}/beehive-test-dist/netui/jsf">
              <fileset dir="${netui.home}/external/jsf"/>