myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1453065 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/ tobago-core/src/main/resources/META-INF/ tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/...
Date Tue, 05 Mar 2013 22:50:46 GMT
Author: lofwyr
Date: Tue Mar  5 22:50:46 2013
New Revision: 1453065

URL: http://svn.apache.org/r1453065
Log:
TOBAGO-1229: Using Facelets 2.0 from JSF 2.0 instead of Facelets 1.1 from Sun
- generating the tobago-extension.taglib.xml

Added:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/LabelExtensionHandler.java
      - copied, changed from r1452918, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java
Removed:
    myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/tobago-extension.taglib.xml
Modified:
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ExtensionTag.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java

Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/LabelExtensionHandler.java
(from r1452918, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/LabelExtensionHandler.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/LabelExtensionHandler.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java&r1=1452918&r2=1453065&rev=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/InExtensionHandler.java
(original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/LabelExtensionHandler.java
Tue Mar  5 22:50:46 2013
@@ -20,21 +20,24 @@
 package org.apache.myfaces.tobago.facelets.extension;
 
 import org.apache.myfaces.tobago.component.RendererTypes;
-import org.apache.myfaces.tobago.component.UIIn;
+import org.apache.myfaces.tobago.component.UILabel;
 
 import javax.faces.view.facelets.ComponentConfig;
 
-public class InExtensionHandler extends TobagoLabelExtensionHandler {
+/**
+ * XXX Still not implemented correctly!
+ */
+public class LabelExtensionHandler extends TobagoLabelExtensionHandler {
 
-  public InExtensionHandler(ComponentConfig config) {
+  public LabelExtensionHandler(ComponentConfig config) {
     super(config);
   }
 
   protected String getSubComponentType() {
-    return UIIn.COMPONENT_TYPE;
+    return UILabel.COMPONENT_TYPE;
   }
 
   protected String getSubRendererType() {
-    return RendererTypes.IN;
+    return RendererTypes.LABEL;
   }
 }

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -48,7 +48,9 @@ import javax.servlet.jsp.JspException;
  * </pre>
  */
 @Tag(name = "date")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.DateTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.DateTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.DateExtensionHandler")
 public class DateExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private static final long serialVersionUID = 2044784791513107420L;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -47,7 +47,9 @@ import javax.servlet.jsp.JspException;
  */
 
 @Tag(name = "file")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.FileTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.FileTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.FileExtensionHandler")
 public class FileExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression binding;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -51,7 +51,9 @@ import javax.servlet.jsp.JspException;
  */
 
 @Tag(name = "in")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.InTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.InTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.InExtensionHandler")
 public class InExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private ValueExpression binding;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -62,7 +62,9 @@ import javax.servlet.jsp.JspException;
  */
 
 @Tag(name = "label")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.LabelTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.LabelTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.LabelExtensionHandler")
 public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private static final Logger LOG = LoggerFactory.getLogger(LabelExtensionTag.class);

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -50,7 +50,11 @@ import javax.servlet.jsp.JspException;
 @Tag(
     name = "menuCheckbox",
     tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.component.MenuCheckboxTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.component.MenuCheckboxTag",
+    componentType = "org.apache.myfaces.tobago.MenuCommand",
+    rendererType = "MenuCommand",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.MenuCheckboxExtensionHandler")
 public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
   private javax.el.ValueExpression rendered;
   private javax.el.ValueExpression value;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -54,7 +54,11 @@ import javax.servlet.jsp.JspException;
 @Tag(
     name = "menuRadio",
     tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.MenuRadioTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.MenuRadioTag",
+    componentType = "org.apache.myfaces.tobago.MenuCommand",
+    rendererType = "MenuCommand",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.MenuRadioExtensionHandler")
 public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression rendered;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -34,7 +34,9 @@ import javax.servlet.jsp.JspException;
  * Renders a checkbox.
  */
 @Tag(name = "selectBooleanCheckbox")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectBooleanCheckboxExtensionHandler")
 public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression value;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -32,7 +32,9 @@ import javax.servlet.jsp.JspException;
  * Render a group of checkboxes.
  */
 @Tag(name = "selectManyCheckbox")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyCheckboxTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyCheckboxTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectManyCheckboxExtensionHandler")
 public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression required;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -32,7 +32,9 @@ import javax.servlet.jsp.JspException;
  * Renders a multi selection option listbox with a label.
  */
 @Tag(name = "selectManyListbox")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyListboxTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyListboxTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectManyListboxExtensionHandler")
 public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression required;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -32,7 +32,9 @@ import javax.servlet.jsp.JspException;
  * Renders a multi selection option shuttle with a label.
  */
 @Tag(name = "selectManyShuttle")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyShuttleTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyShuttleTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectManyShuttleExtensionHandler")
 public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression required;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -33,7 +33,9 @@ import javax.servlet.jsp.JspException;
  */
 
 @Tag(name = "selectOneChoice")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneChoiceTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneChoiceTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectOneChoiceExtensionHandler")
 public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression required;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -32,7 +32,9 @@ import javax.servlet.jsp.JspException;
  * Render a single selection option listbox.
  */
 @Tag(name = "selectOneListbox")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneListboxTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneListboxTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectOneListboxExtensionHandler")
 public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport {
   private javax.el.ValueExpression required;
   private javax.el.ValueExpression value;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -34,7 +34,9 @@ import javax.servlet.jsp.JspException;
  * @since 1.0.13
  */
 @Tag(name = "selectOneRadio")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectOneRadioExtensionHandler")
 public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression required;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -19,6 +19,8 @@
 
 package org.apache.myfaces.tobago.internal.taglib.extension;
 
+import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
+import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 import org.apache.myfaces.tobago.component.Facets;
@@ -41,7 +43,13 @@ import javax.servlet.jsp.JspException;
  * &lt;/tc:separator>
  * </pre>
  */
-
+@Tag(
+    name = "separator")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.component.SeparatorTag",
+    componentType = "org.apache.myfaces.tobago.Separator",
+    rendererType = "Separator",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SeparatorExtensionHandler")
 public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
   
   private javax.el.ValueExpression binding;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -47,7 +47,9 @@ import javax.servlet.jsp.JspException;
  */
 
 @Tag(name = "textarea")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.TextareaTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.TextareaTag",
+    faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TextareaExtensionHandler")
 public class TextareaExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression binding;

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -46,7 +46,9 @@ import javax.servlet.jsp.JspException;
  * </pre>
  */
 @Tag(name = "time")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.TimeTag")
+@ExtensionTag(
+    baseClassName = "org.apache.myfaces.tobago.internal.taglib.TimeTag",
+        faceletHandler = "org.apache.myfaces.tobago.facelets.extension.TimeExtensionHandler")
 public class TimeExtensionTag extends TobagoExtensionBodyTagSupport {
 
   private javax.el.ValueExpression binding;

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ExtensionTag.java?rev=1453065&r1=1453064&r2=1453065&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ExtensionTag.java
(original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/ExtensionTag.java
Tue Mar  5 22:50:46 2013
@@ -30,4 +30,9 @@ public @interface ExtensionTag {
 
   String baseClassName();
 
+  String componentType() default "org.apache.myfaces.tobago.ExtensionPanel";
+
+  String rendererType() default "Panel";
+
+  String faceletHandler();
 }

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=1453065&r1=1453064&r2=1453065&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 Mar  5 22:50:46 2013
@@ -428,11 +428,7 @@ public class TaglibGenerator extends Abs
         case JSP:
           return target + path.replace('.', '/') + '/' + name + ".tld";
         case FACELETS:
-          if (name.equals("tobago-extension")) {
-            return target + name + "-2.taglib.xml"; // XXX The extension lib will not be
generated corretly... fix it!
-          } else {
-            return target + name + ".taglib.xml";
-          }
+          return target + name + ".taglib.xml";
         default:
           throw new IllegalArgumentException("Program error");
       }
@@ -542,6 +538,15 @@ public class TaglibGenerator extends Abs
             addLeafTextElement(componentTag.faceletHandler(), "handler-class", componentElement,
document);
           }
 
+          ExtensionTag extensionTag = typeElement.getAnnotation(ExtensionTag.class);
+          if (extensionTag != null) {
+            Element componentElement = document.createElement("component");
+            tagElement.appendChild(componentElement);
+            addLeafTextElement(extensionTag.componentType(), "component-type", componentElement,
document);
+            addLeafTextElement(extensionTag.rendererType(), "renderer-type", componentElement,
document);
+            addLeafTextElement(extensionTag.faceletHandler(), "handler-class", componentElement,
document);
+          }
+
           SimpleTag simpleTag = typeElement.getAnnotation(SimpleTag.class);
           if (simpleTag != null) {
             addLeafTextElement(simpleTag.faceletHandler(), "handler-class", tagElement, document);



Mime
View raw message