myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1679031 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/ tobago-tool/tobago-tool-ann...
Date Tue, 12 May 2015 18:56:08 GMT
Author: lofwyr
Date: Tue May 12 18:56:08 2015
New Revision: 1679031

URL: http://svn.apache.org/r1679031
Log:
TOBAGO-1458: Allowed child elements of some tags are to strictly defined.

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetLayoutTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupLayoutTagDeclaration.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSeparatorTagDeclaration.java
    myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/SplitLayoutTagDeclaration.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Tag.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
Tue May 12 18:56:08 2015
@@ -19,10 +19,9 @@
 
 package org.apache.myfaces.tobago.internal.taglib.component;
 
-import org.apache.myfaces.tobago.apt.annotation.BodyContent;
+import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
 import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -42,7 +41,7 @@ import javax.servlet.jsp.tagext.TagSuppo
  * Add an attribute on the UIComponent
  * associated with the closest parent UIComponent custom action.
  */
-@Tag(name = "attribute", bodyContent = BodyContent.EMPTY)
+@Tag(name = "attribute")
 @SimpleTag(
     faceletHandler = "org.apache.myfaces.tobago.facelets.AttributeHandler")
 public abstract class AttributeTag extends TagSupport {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CalendarTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -36,7 +36,7 @@ import javax.faces.component.UIOutput;
 /**
  * Renders a calendar.
  */
-@Tag(name = "calendar", bodyContent = BodyContent.EMPTY)
+@Tag(name = "calendar")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UICalendar",
     uiComponentBaseClass = "javax.faces.component.UIOutput",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnSelectorTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -34,7 +34,7 @@ import javax.faces.component.UIColumn;
 /**
  * Renders a column with checkboxes to mark selected rows.
  */
-@Tag(name = "columnSelector", bodyContent = BodyContent.EMPTY)
+@Tag(name = "columnSelector")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIColumnSelector",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIColumnSelector",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
Tue May 12 18:56:08 2015
@@ -40,7 +40,7 @@ import javax.servlet.jsp.tagext.TagSuppo
  * Register an Converter instance on the UIComponent
  * associated with the closest parent UIComponent.
  */
-@Tag(name = "converter", bodyContent = BodyContent.EMPTY)
+@Tag(name = "converter")
 @SimpleTag(
     faceletHandler = "org.apache.myfaces.tobago.facelets.ConverterHandler")
 public abstract class ConverterTag extends TagSupport {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
Tue May 12 18:56:08 2015
@@ -42,7 +42,7 @@ import javax.servlet.jsp.tagext.TagSuppo
  * can be used by scripts.
  */
 @Preliminary
-@Tag(name = "dataAttribute", bodyContent = BodyContent.EMPTY)
+@Tag(name = "dataAttribute")
 @SimpleTag(
     faceletHandler = "org.apache.myfaces.tobago.facelets.DataAttributeHandler")
 public abstract class DataAttributeTag extends TagSupport {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlowLayoutTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -38,7 +38,7 @@ import org.apache.myfaces.tobago.layout.
  * XXX Warning: Still in progress! Please do not use it until other announcement.
  * Renders a FlowLayout that positions the content components in there natural order.
  */
-@Tag(name = "flowLayout", bodyContent = BodyContent.EMPTY)
+@Tag(name = "flowLayout")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIFlowLayout",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIFlowLayout",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
Tue May 12 18:56:08 2015
@@ -44,7 +44,7 @@ import javax.servlet.jsp.tagext.TagSuppo
 /**
  * Add GridLayoutConstraints to the parent UIComponent.
  */
-@Tag(name = "gridLayoutConstraint", bodyContent = BodyContent.EMPTY)
+@Tag(name = "gridLayoutConstraint")
 @SimpleTag(
     faceletHandler = "org.apache.myfaces.tobago.facelets.GridLayoutConstraintHandler")
 public abstract class GridLayoutConstraintTag extends TagSupport {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -94,7 +94,7 @@ import org.apache.myfaces.tobago.interna
  * </tr>
  * </table>
  */
-@Tag(name = "gridLayout", bodyContent = BodyContent.EMPTY)
+@Tag(name = "gridLayout")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIGridLayout",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIGridLayout",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ImageTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -39,7 +39,7 @@ import javax.faces.component.UIGraphic;
 /**
  * Renders an image.
  */
-@Tag(name = "image", bodyContent = BodyContent.JSP)
+@Tag(name = "image")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIImage",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIImage",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
Tue May 12 18:56:08 2015
@@ -45,7 +45,7 @@ import java.util.Map;
  * Since JSF 1.2 it is possible to use a {@link org.apache.myfaces.tobago.context.TobagoBundle}
  * and configure it in the faces-config.xml.
  */
-@Tag(name = "loadBundle", bodyContent = BodyContent.EMPTY)
+@Tag(name = "loadBundle")
 @SimpleTag(
     faceletHandler = "org.apache.myfaces.tobago.facelets.LoadBundleHandler")
 public abstract class LoadBundleTag extends TagSupport {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuSeparatorTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -33,7 +33,7 @@ import javax.faces.component.UIOutput;
 /**
  * Renders a separator inside of a menu.
  */
-@Tag(name = "menuSeparator", bodyContent = BodyContent.EMPTY)
+@Tag(name = "menuSeparator")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIMenuSeparator",
     uiComponentBaseClass = "javax.faces.component.UIOutput",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MessagesTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -37,7 +37,7 @@ import javax.faces.component.UIMessages;
 /**
  * Renders error/validation messages.
  */
-@Tag(name = "messages", bodyContent = BodyContent.EMPTY)
+@Tag(name = "messages")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIMessages",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIMessages",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ObjectTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -36,7 +36,7 @@ import javax.faces.component.UIOutput;
  * Show external content inside of an application.
  * This will typically renders an iframe tag.
  */
-@Tag(name = "object", bodyContent = BodyContent.EMPTY)
+@Tag(name = "object")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIObject",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIOut",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
Tue May 12 18:56:08 2015
@@ -39,7 +39,7 @@ import javax.servlet.jsp.tagext.TagSuppo
  * Register an PopupActionListener instance on the UIComponent
  * associated with the closest parent UIComponent.
  */
-@Tag(name = "popupReference", bodyContent = BodyContent.EMPTY)
+@Tag(name = "popupReference")
 @SimpleTag(
     faceletHandler = "org.apache.myfaces.tobago.facelets.PopupReferenceHandler")
 public abstract class PopupReferenceTag extends TagSupport {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
Tue May 12 18:56:08 2015
@@ -43,7 +43,7 @@ import javax.servlet.jsp.tagext.TagSuppo
  * A ResetInputActionListener is a declarative way to allow an action source to reset all
EditableValueHolder
  * of a page or in a sub-form or part of the component tree.
  */
-@Tag(name = "resetInputActionListener", bodyContent = BodyContent.EMPTY)
+@Tag(name = "resetInputActionListener")
 @SimpleTag(
     faceletHandler = "org.apache.myfaces.tobago.facelets.ResetInputActionListenerHandler")
 public abstract class ResetInputActionListenerTag extends TagSupport {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -36,7 +36,7 @@ import org.apache.myfaces.tobago.interna
  * associated with the closed parent UIComponent custom
  * action.
  */
-@Tag(name = "selectItem", bodyContent = BodyContent.EMPTY)
+@Tag(name = "selectItem")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UISelectItem",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectItem",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -34,7 +34,7 @@ import org.apache.myfaces.tobago.interna
  * associated with the closed parent UIComponent custom
  * action.
  */
-@Tag(name = "selectItems", bodyContent = BodyContent.EMPTY)
+@Tag(name = "selectItems")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UISelectItems",
     uiComponentBaseClass = "javax.faces.component.UISelectItems",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectReferenceTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -33,7 +33,7 @@ import javax.faces.component.UIOutput;
  * Renders a set of option related to and same type as the <strong>for</strong>
  * component.
  */
-@Tag(name = "selectReference", bodyContent = BodyContent.EMPTY)
+@Tag(name = "selectReference")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UISelectReference",
     uiComponentBaseClass = "javax.faces.component.UIOutput",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetLayoutTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetLayoutTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetLayoutTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.interna
 /**
  * Creates a SheetLayout, which is a internal layout manager of a sheet.
  */
-@Tag(name = "sheetLayout", bodyContent = BodyContent.EMPTY)
+@Tag(name = "sheetLayout")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UISheetLayout",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISheetLayout",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -19,7 +19,6 @@
 
 package org.apache.myfaces.tobago.internal.taglib.component;
 
-import org.apache.myfaces.tobago.apt.annotation.BodyContent;
 import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
@@ -33,7 +32,7 @@ import org.apache.myfaces.tobago.interna
  * <p/>
  * Remark: Inline styles are deprecated because of CSP.
  */
-@Tag(name = "style", bodyContent = BodyContent.TAGDEPENDENT)
+@Tag(name = "style")
 @BodyContentDescription(contentType = "css")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIStyle",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
Tue May 12 18:56:08 2015
@@ -40,7 +40,7 @@ import javax.servlet.jsp.tagext.TagSuppo
  * Register an TabChangedListener instance on the UIComponent
  * associated with the closest parent UIComponent custom action.
  */
-@Tag(name = "tabChangeListener", bodyContent = BodyContent.EMPTY)
+@Tag(name = "tabChangeListener")
 @SimpleTag(
     faceletHandler = "org.apache.myfaces.tobago.facelets.TabChangeListenerHandler")
 public abstract class TabChangeListenerTag extends TagSupport {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupLayoutTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupLayoutTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabGroupLayoutTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -30,7 +30,7 @@ import org.apache.myfaces.tobago.interna
 /**
  * Creates a TabGroupLayout, which is a internal layout manager of a tabGroup.
  */
-@Tag(name = "tabGroupLayout", bodyContent = BodyContent.EMPTY)
+@Tag(name = "tabGroupLayout")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UITabGroupLayout",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUITabGroupLayout",

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSeparatorTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSeparatorTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSeparatorTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.interna
 /**
  * Renders a separator inside of a tool bar.
  */
-@Tag(name = "toolBarSeparator", bodyContent = BodyContent.EMPTY)
+@Tag(name = "toolBarSeparator")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UIToolBarSeparator",
     uiComponentBaseClass = "javax.faces.component.UIOutput",

Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/SplitLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/SplitLayoutTagDeclaration.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/SplitLayoutTagDeclaration.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/SplitLayoutTagDeclaration.java
Tue May 12 18:56:08 2015
@@ -19,7 +19,6 @@
 
 package org.apache.myfaces.tobago.internal.taglib.sandbox;
 
-import org.apache.myfaces.tobago.apt.annotation.BodyContent;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
@@ -39,7 +38,7 @@ import org.apache.myfaces.tobago.interna
    * A area with two child components rendered horizontally or vertically and allows to change
the
    * layout relation of this two components on the client.
    */
-@Tag(name = "splitLayout", bodyContent = BodyContent.EMPTY)
+@Tag(name = "splitLayout")
 @UIComponentTag(
     uiComponent = "org.apache.myfaces.tobago.component.UISplitLayout",
     uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISplitLayout",

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Tag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Tag.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Tag.java
(original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Tag.java
Tue May 12 18:56:08 2015
@@ -30,6 +30,12 @@ public @interface Tag {
 
   String name();
 
+  /**
+   * Should be BodyContent.JSP in any case, because there might be a child tag with a specific
function.
+   * e.g. &lt;tc:dataAttribute>
+   * @deprecated
+   */
+  @Deprecated
   BodyContent bodyContent() default BodyContent.JSP;
 
   String tagExtraInfoClassName() default "";

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java?rev=1679031&r1=1679030&r2=1679031&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
(original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
Tue May 12 18:56:08 2015
@@ -22,8 +22,6 @@ package org.apache.myfaces.tobago.apt.pr
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.myfaces.tobago.apt.AnnotationUtils;
-import org.apache.myfaces.tobago.apt.annotation.BodyContent;
-import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
 import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
 import org.apache.myfaces.tobago.apt.annotation.Facet;
 import org.apache.myfaces.tobago.apt.annotation.Preliminary;
@@ -531,18 +529,7 @@ public class TaglibGenerator extends Abs
             // TODO check tagExtraInfo extends TagExtraInfo
             addLeafTextElement(tagExtraInfo, "tei-class", tagElement, document);
           }
-          final BodyContent bodyContent = annotationTag.bodyContent();
-          final BodyContentDescription contentDescription = typeElement.getAnnotation(BodyContentDescription.class);
-          // TODO more error checking
-          if (contentDescription != null) {
-            if (bodyContent.equals(BodyContent.JSP) && contentDescription.contentType().length()
> 0) {
-              throw new IllegalArgumentException(
-                  "contentType " + contentDescription.contentType() + " for bodyContent JSP
not allowed!");
-            } else if (bodyContent.equals(BodyContent.TAGDEPENDENT) && contentDescription.contentType().length()
== 0) {
-              throw new IllegalArgumentException("contentType should set for tagdependent
bodyContent");
-            }
-          }
-          addLeafTextElement(bodyContent.toString(), "body-content", tagElement, document);
+          addLeafTextElement(annotationTag.bodyContent().toString(), "body-content", tagElement,
document);
           break;
         case FACELETS:
           if (deprecated) {



Mime
View raw message