You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/03/31 19:29:26 UTC

svn commit: r390465 [1/2] - in /incubator/tobago/trunk: src/site/ tobago-core/ tobago-core/src/main/java/org/apache/myfaces/tobago/component/ tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ tobago-core/src/site/ tobago-example/tob...

Author: bommel
Date: Fri Mar 31 09:29:19 2006
New Revision: 390465

URL: http://svn.apache.org/viewcvs?rev=390465&view=rev
Log:
added first facelet integration

Added:
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/pom.xml
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/readme.txt
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/META-INF/
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/META-INF/context.xml
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/classes/
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/classes/log4j.xml
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/faces-config.xml
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/tobago-config.xml
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/web.xml
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/helloWorld.xml
    incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/index.html
    incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/AbstractAnnotationVisitor.java
    incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FaceletAnnotationProcessor.java
    incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FaceletAnnotationProcessorFactory.java
    incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FaceletAnnotationVisitor.java
Modified:
    incubator/tobago/trunk/src/site/site.xml
    incubator/tobago/trunk/tobago-core/pom.xml
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTag.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java
    incubator/tobago/trunk/tobago-core/src/site/site.xml
    incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
    incubator/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java
    incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationVisitor.java
    incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java

Modified: incubator/tobago/trunk/src/site/site.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/src/site/site.xml?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/src/site/site.xml (original)
+++ incubator/tobago/trunk/src/site/site.xml Fri Mar 31 09:29:19 2006
@@ -3,15 +3,15 @@
   <bannerLeft>
     <name>Tobago</name>
     <src>images/tobago_head.gif</src>
-    <!--href>http://tobago.atanion.net</href-->
+    <!--<href>http://tobago.atanion.net</href>-->
     <href>http://incubator.apache.org/tobago</href>
   </bannerLeft>
   <bannerRight>
     <name>MyFaces</name>
     <src>http://incubator.apache.org/images/apache-incubator-logo.png</src>
     <href>http://incubator.apache.org</href>
-    <!--src>http://myfaces.apache.org/images/logo.png</src-->
-    <!--href>http://myfaces.apache.org/</href-->
+    <!--<src>http://myfaces.apache.org/images/logo.png</src>-->
+    <!--<href>http://myfaces.apache.org/</href>-->
   </bannerRight>
   <body>
     <links>

Modified: incubator/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/pom.xml?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/pom.xml (original)
+++ incubator/tobago/trunk/tobago-core/pom.xml Fri Mar 31 09:29:19 2006
@@ -201,7 +201,7 @@
     </dependency>
 
 
-  <!--  <dependency>
+   <!-- <dependency>
       <groupId>javax.faces</groupId>
       <artifactId>jsf-api</artifactId>
       <version>1.1</version>
@@ -215,7 +215,6 @@
       <scope>compile</scope>
     </dependency>-->
 
-
     <dependency>
       <groupId>myfaces</groupId>
       <!--<groupId>org.apache.myfaces.core</groupId>-->
@@ -280,6 +279,37 @@
             <executions>
               <execution>
                 <id>tobago-doc</id>
+                <goals><goal>execute</goal></goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>generate-facelet-taglib</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.myfaces.tobago</groupId>
+            <artifactId>maven-apt-plugin</artifactId>
+            <version>${version}</version>
+            <configuration>
+              <excludes>
+                <exclude>org/apache/myfaces/tobago/taglib/extension/*</exclude>
+              </excludes>
+              <targetFiles>
+                <targetFile>tobago.taglib.xml</targetFile>
+              </targetFiles>
+              <resourceTargetPath>META-INF</resourceTargetPath>
+              <generated>target/generated-tld</generated>
+              <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>
+              <nocompile>true</nocompile>
+              <encoding>UTF-8</encoding>
+            </configuration>
+            <executions>
+              <execution>
+                <id>tobago-facelet-taglib</id>
                 <goals><goal>execute</goal></goals>
               </execution>
             </executions>

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java Fri Mar 31 09:29:19 2006
@@ -19,7 +19,7 @@
 import javax.faces.context.FacesContext;
 
 
-/**
+/*
  * Created by IntelliJ IDEA.
  * User: bommel
  * Date: 09.02.2006
@@ -50,6 +50,38 @@
     values[3] = tip;
     values[4] = createSpan;
     return values;
+  }
+
+  public boolean isEscape() {
+    return escape;
+  }
+
+  public void setEscape(boolean escape) {
+    this.escape = escape;
+  }
+
+  public String getMarkup() {
+    return markup;
+  }
+
+  public void setMarkup(String markup) {
+    this.markup = markup;
+  }
+
+  public String getTip() {
+    return tip;
+  }
+
+  public void setTip(String tip) {
+    this.tip = tip;
+  }
+
+  public boolean isCreateSpan() {
+    return createSpan;
+  }
+
+  public void setCreateSpan(boolean createSpan) {
+    this.createSpan = createSpan;
   }
 
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/BoxTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -26,7 +26,9 @@
  * Renders a panel with border and title.
  */
 @Tag(name = "box")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIPanel")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Panel",
+    UIComponent = "org.apache.myfaces.tobago.component.UIPanel",
+    RendererType = "Box")
 
 public interface BoxTagDeclaration extends TobagoBodyTagDeclaration,
     HasIdBindingAndRendered, HasDimension, HasLabel {

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ButtonTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -32,16 +32,22 @@
 import org.apache.myfaces.tobago.taglib.decl.IsImmediateCommand;
 import org.apache.myfaces.tobago.taglib.decl.IsInline;
 
-/**
+/*
  * Created by IntelliJ IDEA.
  * User: bommel
  * Date: 10.02.2006
  * Time: 22:00:03
  * To change this template use File | Settings | File Templates.
  */
+
+/**
+ * Renders a button element.
+ */
 @Tag(name = "button")
 @BodyContentDescription(anyTagOf = "facestag")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIPanel")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Command",
+    UIComponent = "org.apache.myfaces.tobago.component.UICommand",
+    RendererType = "Button")
 
 public interface ButtonTagDeclaration extends CommandTagDeclaration,
     HasIdBindingAndRendered, HasLabelAndAccessKey, HasImage,

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CalendarTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -33,7 +33,9 @@
  * Renders a calendar.
  */
 @Tag(name = "calendar", bodyContent = BodyContent.EMPTY)
-@UIComponentTag(UIComponent = "javax.faces.component.UIOutput")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Calendar",
+    UIComponent = "javax.faces.component.UIOutput",
+    RendererType = "Calendar")
 public interface CalendarTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasValue {
 
   /**

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CellTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -35,7 +35,9 @@
  * A panel with ability to span over more than one layout cells.
  */
 @Tag(name = "cell")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UICell")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Cell",
+    UIComponent = "org.apache.myfaces.tobago.component.UICell",
+    RendererType = "Panel")
 public interface CellTagDeclaration extends TobagoBodyTagDeclaration, 
     HasIdBindingAndRendered {
 

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTag.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTag.java Fri Mar 31 09:29:19 2006
@@ -21,18 +21,12 @@
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.component.ComponentUtil;
 import org.apache.myfaces.tobago.component.UIColumnSelector;
-import org.apache.myfaces.tobago.taglib.decl.HasBinding;
-import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
-import org.apache.myfaces.tobago.taglib.decl.IsRendered;
 
 import javax.faces.component.UIComponent;
 
-/**
- * Renders a column with checkboxes to mark selected row's.
- */
-@Tag(name = "columnSelector", bodyContent = BodyContent.EMPTY)
+
 public class ColumnSelectorTag extends TobagoTag
-    implements IsDisabled, IsRendered, HasBinding {
+    implements ColumnSelectorTagDeclaration {
 
   private String disabled;
 

Added: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java (added)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnSelectorTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -0,0 +1,26 @@
+package org.apache.myfaces.tobago.taglib.component;
+
+import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
+import org.apache.myfaces.tobago.taglib.decl.IsRendered;
+import org.apache.myfaces.tobago.taglib.decl.HasBinding;
+import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.BodyContent;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+
+/*
+ * Created by IntelliJ IDEA.
+ * User: bommel
+ * Date: 30.03.2006
+ * Time: 21:37:36
+ * To change this template use File | Settings | File Templates.
+ */
+
+/**
+ * Renders a column with checkboxes to mark selected row's.
+ */
+@Tag(name = "columnSelector", bodyContent = BodyContent.EMPTY)
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.ColumnSelector",
+    UIComponent = "org.apache.myfaces.tobago.component.UIColumnSelector",
+    RendererType = "ColumnSelector")
+public interface ColumnSelectorTagDeclaration extends TobagoTagDeclaration, IsDisabled, IsRendered, HasBinding {
+}

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -36,7 +36,9 @@
  * parent UIData component.
  */
 @Tag(name = "column")
-@UIComponentTag(UIComponent = "javax.faces.component.UIColumn")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Column",
+    UIComponent = "javax.faces.component.UIColumn",
+    RendererType = "Column")
 public interface ColumnTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasLabel {
   /**
    * Alignment of this column.
@@ -52,6 +54,7 @@
    * <code>org.apache.myfaces.tobago.model.SortableByApplication</code>.
    */
   @TagAttribute
-  @UIComponentTagAttribute(type = { "java.lang.Boolean" }, defaultValue = "false")
+  @UIComponentTagAttribute(type = { "java.lang.Boolean" },
+      defaultValue = "false")
   void setSortable(String sortable);
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/CommandTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
 
-/**
+/*
  * Created by IntelliJ IDEA.
  * User: bommel
  * Date: 10.02.2006
@@ -26,6 +25,6 @@
  * To change this template use File | Settings | File Templates.
  */
 
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UICommand")
+
 public interface CommandTagDeclaration extends TobagoTagDeclaration {
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_IN;
+import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_DATE;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
@@ -37,7 +37,9 @@
  * Renders a date input field.
  */
 @Tag(name = "date")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIInput", RendererType = RENDERER_TYPE_IN)
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Input",
+    UIComponent = "org.apache.myfaces.tobago.component.UIInput",
+    RendererType = RENDERER_TYPE_DATE)
 public interface DateTagDeclaration
     extends InputTagDeclaration, HasIdBindingAndRendered, HasValue, IsReadonly,
     IsDisabled, IsInline, HasLabelAndAccessKey, HasTip, IsRequired {

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -35,7 +35,9 @@
  * Renders a file input field.
  */
 @Tag(name = "file")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIInput")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.FileInput",
+    UIComponent = "org.apache.myfaces.tobago.component.UIFileInput",
+    RendererType = "File")
 public interface FileTagDeclaration
     extends InputTagDeclaration, HasIdBindingAndRendered, IsDisabled,
     HasLabelAndAccessKey, HasOnchangeListener, HasTip {

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/FormTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -29,7 +29,9 @@
  * To change this template use File | Settings | File Templates.
  */
 @Tag(name = "form")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIForm")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Form",
+    UIComponent = "org.apache.myfaces.tobago.component.UIForm",
+    RendererType = "Form")
 public interface FormTagDeclaration extends TobagoBodyTagDeclaration,
     HasBinding, HasId {
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/GridLayoutTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -37,7 +37,9 @@
  */
 
 @Tag(name = "gridLayout", bodyContent = BodyContent.EMPTY)
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIGridLayout")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.GridLayout",
+    UIComponent = "org.apache.myfaces.tobago.component.UIGridLayout",
+    RendererType = "GridLayout")
 public interface GridLayoutTagDeclaration extends TobagoTagDeclaration, HasId, HasBorder, HasCellspacing, HasMargin,
     HasMargins, HasColumnLayout, HasRowLayout, HasBinding {
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/HiddenTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -32,7 +32,9 @@
  * Renders a 'hidden' input element.
  */
 @Tag(name = "hidden")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIInput")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.HiddenInput",
+    UIComponent = "org.apache.myfaces.tobago.component.UIHiddenInput",
+    RendererType = "Hidden")
 public interface HiddenTagDeclaration extends BeanTagDeclaration, HasId, HasBinding, HasValue {
 
   @UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "true")

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ImageTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -35,7 +35,9 @@
  *  Renders a Image.
  */
 @Tag(name = "image", bodyContent = BodyContent.EMPTY)
-@UIComponentTag(UIComponent = "javax.faces.component.UIGraphic")
+@UIComponentTag(ComponentType = "javax.faces.Graphic",
+    UIComponent = "javax.faces.component.UIGraphic",
+    RendererType = "Image")
 public interface ImageTagDeclaration extends TobagoTagDeclaration,
     HasIdBindingAndRendered, HasBorder, HasDimension, HasTip {
 

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/InTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -18,6 +18,7 @@
 
 import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.taglib.decl.HasConverter;
 import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
 import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
@@ -43,6 +44,9 @@
  */
 @Tag(name = "in")
 @BodyContentDescription(anyTagOf = "facestag")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Input",
+    UIComponent = "org.apache.myfaces.tobago.component.UIInput",
+    RendererType = "In")
 public interface InTagDeclaration
     extends TextInputTagDeclaration, HasValue, HasIdBindingAndRendered,
     HasConverter, IsReadonly, IsDisabled, HasWidth, HasOnchangeListener,

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -39,7 +39,9 @@
  * Renders a label component.
  */
 @Tag(name = "label", bodyContent = BodyContent.EMPTY)
-@UIComponentTag(UIComponent = "javax.faces.component.UIOutput")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Label",
+    UIComponent = "org.apache.myfaces.tobago.component.UILabel",
+    RendererType = "Label")
 public interface LabelTagDeclaration extends BeanTagDeclaration, HasIdBindingAndRendered,
     HasLabelWithAccessKey, HasFor, IsInline, HasWidth, HasTip, HasValue {
 

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -18,6 +18,7 @@
 
 import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.taglib.decl.HasAction;
 import org.apache.myfaces.tobago.taglib.decl.HasActionListener;
 import org.apache.myfaces.tobago.taglib.decl.HasCommandType;
@@ -43,6 +44,9 @@
  */
 @Tag(name = "link")
 @BodyContentDescription(anyTagOf = "facestag")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Command",
+    UIComponent = "org.apache.myfaces.tobago.component.UICommand",
+    RendererType = "Link")
 public interface LinkTagDeclaration extends CommandTagDeclaration,
     HasIdBindingAndRendered, HasLabelAndAccessKey, IsDisabled,
     HasAction, HasActionListener, IsInline, HasCommandType,

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java Fri Mar 31 09:29:19 2006
@@ -52,7 +52,7 @@
     super.setProperties(component);
     ComponentUtil.setBooleanProperty(component, ATTR_ESCAPE, escape);
     // TODO ???? SPAN ?
-    ComponentUtil.setBooleanProperty(component, ATTR_CREATE_SPAN, "true");
+    //ComponentUtil.setBooleanProperty(component, ATTR_CREATE_SPAN, "true");
     ComponentUtil.setStringProperty(component, ATTR_MARKUP, markup);
     ComponentUtil.setStringProperty(component, ATTR_TIP, tip);
   }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -39,7 +39,9 @@
  */
 @Tag(name = "out")
 @BodyContentDescription(anyTagOf = "f:converter|f:convertNumber|f:convertDateTime|...")
-@UIComponentTag(UIComponent = "javax.faces.component.UIOutput")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Output",
+    UIComponent = "org.apache.myfaces.tobago.component.UIOutput",
+    RendererType = "Out")
 
 public interface OutTagDeclaration extends
     BeanTagDeclaration, HasIdBindingAndRendered, HasConverter, IsInline, HasTip, HasValue {

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java Fri Mar 31 09:29:19 2006
@@ -21,28 +21,18 @@
 import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
 import static org.apache.myfaces.tobago.TobagoConstants.ATTR_METHOD;
 import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STATE;
-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.ComponentUtil;
 import org.apache.myfaces.tobago.component.UIPage;
 import org.apache.myfaces.tobago.component.UIPopup;
-import org.apache.myfaces.tobago.taglib.decl.HasBinding;
-import org.apache.myfaces.tobago.taglib.decl.HasDimension;
-import org.apache.myfaces.tobago.taglib.decl.HasId;
-import org.apache.myfaces.tobago.taglib.decl.HasLabel;
-import org.apache.myfaces.tobago.taglib.decl.HasState;
 
 import javax.faces.component.UIComponent;
 import javax.servlet.jsp.JspException;
 import java.util.List;
 
-/**
- * TODO description of page tag
- */
-@Tag(name = "page")
+
+
 public class PageTag extends TobagoBodyTag
-    implements HasLabel, HasId, HasDimension, HasBinding, HasState {
+    implements PageTagDeclaration {
 
   private String doctype = "loose";
 
@@ -93,18 +83,7 @@
   }
 
 
-  /**
-   * values for doctype :
-   * 'strict'   : HTML 4.01 Strict DTD
-   * 'loose'    : HTML 4.01 Transitional DTD
-   * 'frameset' : HTML 4.01 Frameset DTD
-   * all other values are ignored and no DOCTYPE is set.
-   * default value is 'loose'
-   *
-   * @param doctype
-   */
-  @TagAttribute
-  @UIComponentTagAttribute(defaultValue = "loose")
+
   public void setDoctype(String doctype) {
     this.doctype = doctype;
   }
@@ -121,17 +100,6 @@
     return focusId;
   }
 
-
-  /**
-   * Contains the id of the component witch should have the focus after
-   * loading the page.
-   * Set to emtpy string for disabling setting of focus.
-   * Default (null) enables the "auto focus" feature.
-   *
-   * @param focusId
-   */
-  @TagAttribute
-  @UIComponentTagAttribute()
   public void setFocusId(String focusId) {
     this.focusId = focusId;
   }

Added: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java (added)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -0,0 +1,71 @@
+package org.apache.myfaces.tobago.taglib.component;
+
+/*
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.taglib.decl.HasLabel;
+import org.apache.myfaces.tobago.taglib.decl.HasId;
+import org.apache.myfaces.tobago.taglib.decl.HasDimension;
+import org.apache.myfaces.tobago.taglib.decl.HasBinding;
+import org.apache.myfaces.tobago.taglib.decl.HasState;
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+
+/*
+ * Created by IntelliJ IDEA.
+ * User: bommel
+ * Date: 30.03.2006
+ * Time: 21:57:22
+ * To change this template use File | Settings | File Templates.
+ */
+/**
+ * TODO description of page tag
+ */
+@Tag(name = "page")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Page",
+    UIComponent = "org.apache.myfaces.tobago.component.UIPage",
+    RendererType = "Page")
+
+public interface PageTagDeclaration extends TobagoBodyTagDeclaration, HasLabel, HasId, HasDimension, HasBinding,
+    HasState {
+  /**
+   * values for doctype :
+   * 'strict'   : HTML 4.01 Strict DTD
+   * 'loose'    : HTML 4.01 Transitional DTD
+   * 'frameset' : HTML 4.01 Frameset DTD
+   * all other values are ignored and no DOCTYPE is set.
+   * default value is 'loose'
+   *
+   * @param doctype
+   */
+  @TagAttribute
+  @UIComponentTagAttribute(defaultValue = "loose")
+  void setDoctype(String doctype);
+
+  /**
+   * Contains the id of the component witch should have the focus after
+   * loading the page.
+   * Set to emtpy string for disabling setting of focus.
+   * Default (null) enables the "auto focus" feature.
+   *
+   * @param focusId
+   */
+  @TagAttribute
+  @UIComponentTagAttribute()
+  void setFocusId(String focusId);
+}

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -21,7 +21,7 @@
 import org.apache.myfaces.tobago.taglib.decl.HasDimension;
 import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
 
-/**
+/*
  * Created by IntelliJ IDEA.
  * User: bommel
  * Date: 11.02.2006
@@ -33,7 +33,9 @@
  * nested, such as in the case of facets.
  */
 @Tag(name = "panel")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIPanel")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Panel",
+    UIComponent = "org.apache.myfaces.tobago.component.UIPanel",
+    RendererType = "Panel")
 public interface PanelTagDeclaration extends TobagoBodyTagDeclaration,
     HasIdBindingAndRendered, HasDimension {
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -33,7 +33,9 @@
  * Renders a progressbar.
  */
 @Tag(name = "progress", bodyContent = BodyContent.EMPTY)
-@UIComponentTag(UIComponent = "javax.faces.component.UIOutput")
+@UIComponentTag(ComponentType = "javax.faces.Output",
+    UIComponent = "javax.faces.component.UIOutput",
+    RendererType = "Progress")
 public interface ProgressTagDeclaration extends BeanTagDeclaration, HasIdBindingAndRendered, HasTip {
 
   /**

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -36,7 +36,9 @@
  */
 @Tag(name = "selectBooleanCheckbox")
 @BodyContentDescription(anyTagOf = "<f:facet>* ")
-@UIComponentTag(UIComponent = "javax.faces.component.UISelectBoolean")
+@UIComponentTag(ComponentType = "javax.faces.SelectBoolean",
+    UIComponent = "javax.faces.component.UISelectBoolean",
+    RendererType = "SelectBooleanCheckbox")
 public interface SelectBooleanCheckboxTagDeclaration extends InputTagDeclaration,
     HasIdBindingAndRendered, HasLabelAndAccessKey, HasBooleanValue, IsDisabled, IsInline, HasTip {
 

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -18,6 +18,7 @@
 
 import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.taglib.decl.HasBinding;
 import org.apache.myfaces.tobago.taglib.decl.HasId;
 import org.apache.myfaces.tobago.taglib.decl.HasRenderRange;
@@ -37,6 +38,9 @@
  */
 @Tag(name = "selectManyCheckbox")
 @BodyContentDescription(anyTagOf= "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
+@UIComponentTag(ComponentType = "javax.faces.SelectMany",
+    UIComponent = "javax.faces.component.UISelectMany",
+    RendererType = "SelectManyCheckbox")
 public interface SelectManyCheckboxTagDeclaration extends
     SelectManyTagDeclaration, HasValue, IsDisabled, HasId,
     IsInline, HasRenderRange, IsRendered, HasBinding {

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -37,7 +37,10 @@
  * Render a multi selection option listbox.
  */
 @Tag(name = "selectManyListbox")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UISelectMany")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.SelectMany",
+    UIComponent = "org.apache.myfaces.tobago.component.UISelectMany",
+    RendererType = "SelectManyListbox")
+
 public interface SelectManyListboxTagDeclaration
     extends SelectManyTagDeclaration, HasId, HasValue, IsDisabled, 
     HasHeight, IsInline, HasLabelAndAccessKey, IsRendered, HasBinding, HasTip {

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -23,7 +23,7 @@
  * User: bommel
  * $Id: $
  */
-@UIComponentTag(UIComponent = "javax.faces.component.UISelectMany")
+
 public interface SelectManyTagDeclaration extends InputTagDeclaration {
 
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -20,6 +20,7 @@
 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.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.taglib.decl.HasBinding;
 import org.apache.myfaces.tobago.taglib.decl.HasId;
 import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
@@ -42,6 +43,9 @@
  */
 @Tag(name = "selectOneChoice")
 @BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.SelectOne",
+    UIComponent = "org.apache.myfaces.tobago.component.UISelectOne",
+    RendererType = "SelectOneChoice")
 public interface SelectOneChoiceTagDeclaration
     extends SelectOneTagDeclaration, HasId, HasValue, IsDisabled,
     IsReadonly, HasOnchangeListener, IsInline, HasLabelAndAccessKey,

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -20,6 +20,7 @@
 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.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.taglib.decl.HasBinding;
 import org.apache.myfaces.tobago.taglib.decl.HasHeight;
 import org.apache.myfaces.tobago.taglib.decl.HasId;
@@ -41,6 +42,9 @@
  */
 @Tag(name = "selectOneListbox")
 @BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.SelectOne",
+    UIComponent = "org.apache.myfaces.tobago.component.UISelectOne",
+    RendererType = "SelectOneListbox")
 public interface SelectOneListboxTagDeclaration extends SelectOneTagDeclaration, HasId, HasValue, IsDisabled,
     IsReadonly, HasOnchangeListener, HasLabelAndAccessKey, IsRendered, HasBinding, HasHeight, HasTip {
 

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -20,6 +20,7 @@
 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.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.taglib.decl.HasBinding;
 import org.apache.myfaces.tobago.taglib.decl.HasId;
 import org.apache.myfaces.tobago.taglib.decl.HasOnchangeListener;
@@ -39,6 +40,9 @@
  */
 @Tag(name = "selectOneRadio")
 @BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.SelectOne",
+    UIComponent = "org.apache.myfaces.tobago.component.UISelectOne",
+    RendererType = "SelectOneRadio")
 public interface SelectOneRadioTagDeclaration extends SelectOneTagDeclaration, HasValue, IsDisabled, HasId,
     HasOnchangeListener, IsInline, HasRenderRange, IsRendered, HasBinding {
 

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -16,14 +16,12 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-
 /*
  * Created: Aug 5, 2005 5:27:47 PM
  * User: bommel
  * $Id: $
  */
-@UIComponentTag(UIComponent = "javax.faces.component.UISelectOne")
+
 public interface SelectOneTagDeclaration extends InputTagDeclaration {
 
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -19,6 +19,7 @@
 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.apt.annotation.UIComponentTag;
 import org.apache.myfaces.tobago.taglib.decl.HasConverter;
 import org.apache.myfaces.tobago.taglib.decl.HasDimension;
 import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
@@ -41,6 +42,9 @@
  * Renders a multiline text input control.
  */
 @Tag(name = "textarea")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Input",
+    UIComponent = "org.apache.myfaces.tobago.component.UIInput",
+    RendererType = "Textarea")
 public interface TextAreaTagDeclaration extends TextInputTagDeclaration, HasIdBindingAndRendered,
         HasValue, HasConverter, IsReadonly, IsDisabled, HasDimension, HasOnchangeListener,
         IsFocus, IsRequired, HasLabelAndAccessKey, HasTip {

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -16,14 +16,12 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-
 /**
  * Created: Aug 5, 2005 4:47:53 PM
  * User: bommel
  * $Id: $
  */
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIInput")
+
 public interface TextInputTagDeclaration extends InputTagDeclaration {
 
 }

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -36,7 +36,8 @@
  * Renders a time input field.
  */
 @Tag(name = "time")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UIInput",
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Input",
+    UIComponent = "org.apache.myfaces.tobago.component.UIInput",
     RendererType=RENDERER_TYPE_TIME)
 public interface TimeTagDeclaration
     extends InputTagDeclaration, HasIdBindingAndRendered, HasValue,

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/ToolBarTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -59,7 +59,9 @@
 
 @Tag(name = "toolBar")
 @BodyContentDescription(anyTagOf = "(<tc:toolBarCommand>|<tc:toolBarSelectBoolean>|<tc:toolBarSelectOne>)* ")
-@UIComponentTag(UIComponent = "javax.faces.component.UIPanel")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.ToolBar",
+    UIComponent = "org.apache.myfaces.tobago.component.UIToolBar",
+    RendererType = "ToolBar")
 public interface ToolBarTagDeclaration extends PanelTagDeclaration {
   /**
    * Position of the button label, possible values are: right, bottom, off.

Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java Fri Mar 31 09:29:19 2006
@@ -44,7 +44,9 @@
 @BodyContentDescription(anyTagOf = "<f:facet>* <f:actionListener>?")
 @Preliminary(
     "Implement a var attribute for the tree like in the sheet (http://issues.apache.org/jira/browse/MYFACES-903)")
-@UIComponentTag(UIComponent = "org.apache.myfaces.tobago.component.UITree")
+@UIComponentTag(ComponentType = "org.apache.myfaces.tobago.Tree",
+    UIComponent = "org.apache.myfaces.tobago.component.UITree",
+    RendererType = "Tree")
 public interface TreeTagDeclaration extends TobagoTagDeclaration,
     HasIdBindingAndRendered, HasTreeNodeValue, HasState,
     HasIdReference, HasActionListener, HasNameReference, IsRequired {

Modified: incubator/tobago/trunk/tobago-core/src/site/site.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/site/site.xml?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/site/site.xml (original)
+++ incubator/tobago/trunk/tobago-core/src/site/site.xml Fri Mar 31 09:29:19 2006
@@ -3,7 +3,7 @@
   <bannerLeft>
     <name>Tobago</name>
     <src>http://tobago.atanion.net/site/images/tobago_head.gif</src>
-    <!--href>http://tobago.atanion.net</href-->
+    <!--<href>http://tobago.atanion.net</href>-->
     <href>http://incubator.apache.org/tobago</href>
   </bannerLeft>
   <bannerRight>

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/pom.xml?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/pom.xml (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/pom.xml Fri Mar 31 09:29:19 2006
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.myfaces.tobago</groupId>
+    <artifactId>tobago-example</artifactId>
+    <version>1.0.7-SNAPSHOT</version>
+  </parent>
+  <artifactId>tobago-example-facelets</artifactId>
+  <packaging>war</packaging>
+  <name>Tobago Example Facelets</name>
+  <build>
+    <finalName>tobago-example-facelets</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-scarborough</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-speyside</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-richmond</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-standard</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>sun.jdk</groupId>
+          <artifactId>tools</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>javax.el</groupId>
+      <artifactId>el-api</artifactId>
+      <version>1.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.el</groupId>
+      <artifactId>el-ri</artifactId>
+      <version>1.0</version>
+      <scope>runtime</scope>
+    </dependency><dependency>
+      <groupId>com.sun.facelets</groupId>
+      <artifactId>jsf-facelets</artifactId>
+      <version>1.0.14</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.11</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/readme.txt
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/readme.txt?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/readme.txt (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/readme.txt Fri Mar 31 09:29:19 2006
@@ -0,0 +1,23 @@
+Building
+--------
+
+The facelets and el jars are not available on
+a public maven repository.
+
+You have to download the facelet distribution from:
+
+http://facelets.dev.java.net
+
+and install the missing artifact with
+
+ mvn install:install-file -Dfile=el-api.jar -DgroupId=javax.el \
+ -DartifactId=el-api -Dversion=1.0 -Dpackaging=jar
+
+ mvn install:install-file -Dfile=el-ri.jar -DgroupId=com.sun.el \
+ -DartifactId=el-ri -Dversion=1.0 -Dpackaging=jar
+
+ mvn install:install-file -Dfile=jsf-facelets.jar -DgroupId=com.sun.facelets \
+ -DartifactId=jsf-facelets -Dversion=1.0.14 -Dpackaging=jar
+
+
+

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/META-INF/context.xml?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/META-INF/context.xml (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/META-INF/context.xml Fri Mar 31 09:29:19 2006
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+-->
+<!--
+    Context configuration file for the Tomcat Manager Web App
+
+    antiResourceLocking is needed  for proper redeploy under Windows.
+-->
+
+<Context antiResourceLocking="true" >
+</Context>

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/classes/log4j.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/classes/log4j.xml?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/classes/log4j.xml (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/classes/log4j.xml Fri Mar 31 09:29:19 2006
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+-->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration>
+
+  <appender name="logfile" class="org.apache.log4j.FileAppender">
+    <param name="File"   value="tobago-example-facelets.log" />
+    <param name="Append" value="true" />
+    <param name="Encoding" value="UTF-8" />
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern"
+          value="%d{yyyy-MM-dd HH:mm:ss} %-5p - %c:%L - %m%n"/>
+      <!--
+        %d{...} date pattern
+        %p      priority
+        %m      log message
+        %n      newline
+        -5      fill with spaces (5)
+
+        For more options see class org.apache.log4j.PatternLayout.
+      -->
+    </layout>
+  </appender>
+
+<!--
+  <category name="org.apache.myfaces.tobago.config.ThemeConfig">
+    <priority value="debug"/>
+  </category>
+-->
+
+  <root>
+    <priority value="info" />
+    <appender-ref ref="logfile" />
+  </root>
+
+</log4j:configuration>

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/faces-config.xml?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/faces-config.xml (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/faces-config.xml Fri Mar 31 09:29:19 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+-->
+
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+<faces-config>
+
+  <application>
+    <view-handler>
+      com.sun.facelets.FaceletViewHandler
+    </view-handler>
+    <locale-config>
+      <default-locale>en</default-locale>
+      <supported-locale>de</supported-locale>
+      <supported-locale>de_DE</supported-locale>
+      <supported-locale>de_AT</supported-locale>
+      <supported-locale>de_CH</supported-locale>
+    </locale-config>
+  </application>
+
+</faces-config>

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/tobago-config.xml?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/tobago-config.xml (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/tobago-config.xml Fri Mar 31 09:29:19 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+-->
+
+<!DOCTYPE tobago-config PUBLIC
+    "-//The Apache Software Foundation//DTD Tobago Config 1.0//EN" "tobago-config_1_0.dtd">
+
+<tobago-config>
+
+  <theme-config>
+    <default-theme>org.apache.myfaces.tobago.context.SpeysideTheme</default-theme>
+  </theme-config>
+
+  <resource-dir>tobago-resource</resource-dir>
+  <resource-dir>org/apache/myfaces/tobago/renderkit</resource-dir>
+
+</tobago-config>

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/web.xml?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/WEB-INF/web.xml Fri Mar 31 09:29:19 2006
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+-->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+  <display-name>Blank Tobago Application</display-name>
+
+  <context-param>
+    <param-name>facelets.LIBRARIES</param-name>
+    <param-value>/WEB-INF/facelet/tobago.taglib.xml</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>facelets.DEVELOPMENT</param-name>
+    <param-value>true</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+    <param-value>.xml</param-value>
+  </context-param>
+
+  <servlet>
+    <servlet-name>FacesServlet</servlet-name>
+    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>ResourceServlet</servlet-name>
+    <servlet-class>org.apache.myfaces.tobago.servlet.ResourceServlet</servlet-class>
+  </servlet>
+
+
+  <!-- servlet-mapping -->
+  <servlet-mapping>
+    <servlet-name>FacesServlet</servlet-name>
+    <url-pattern>*.jsf</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ResourceServlet</servlet-name>
+    <url-pattern>/org/apache/myfaces/tobago/renderkit/*</url-pattern>
+  </servlet-mapping>
+
+
+  <!-- The Usual Welcome File List -->
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/helloWorld.xml
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/helloWorld.xml?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/helloWorld.xml (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/helloWorld.xml Fri Mar 31 09:29:19 2006
@@ -0,0 +1,16 @@
+<f:view xmlns:f="http://java.sun.com/jsf/core"
+        xmlns:tc="http://myfaces.apache.org/tobago/component">
+  <tc:page>
+    <f:facet name="layout">
+      <tc:gridLayout/>
+    </f:facet>
+    <tc:out value="Hello World!"/>
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:gridLayout columns="fixed;*"/>
+      </f:facet>
+      <tc:label value="foo"/>
+      <tc:in value="bar"/>
+    </tc:panel>
+  </tc:page>
+</f:view>
\ No newline at end of file

Added: incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/index.html
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/index.html?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/index.html (added)
+++ incubator/tobago/trunk/tobago-example/tobago-example-facelets/src/main/webapp/index.html Fri Mar 31 09:29:19 2006
@@ -0,0 +1,5 @@
+<html>
+<header>
+<meta http-equiv="Refresh" content="0;url=helloWorld.jsf">
+</header>
+</html>
\ No newline at end of file

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Fri Mar 31 09:29:19 2006
@@ -224,8 +224,7 @@
 
     // render remaining script tags
     for (String scriptFile : scriptFiles) {
-      String script = (String) scriptFile;
-      addScripts(writer, facesContext, script);
+      addScripts(writer, facesContext, scriptFile);
     }
 
     // focus id

Modified: incubator/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java?rev=390465&r1=390464&r2=390465&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java (original)
+++ incubator/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java Fri Mar 31 09:29:19 2006
@@ -29,7 +29,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -114,7 +113,7 @@
   /**
    * Executes the WarMojo on the current project.
    *
-   * @throws org.apache.maven.plugin.MojoExecutionException
+   * @throws org.apache.myfaces.maven.plugin.MojoExecutionException
    *          if an error occured while building the webapp
    */
   public void execute()

Added: incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/AbstractAnnotationVisitor.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/AbstractAnnotationVisitor.java?rev=390465&view=auto
==============================================================================
--- incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/AbstractAnnotationVisitor.java (added)
+++ incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/AbstractAnnotationVisitor.java Fri Mar 31 09:29:19 2006
@@ -0,0 +1,52 @@
+package org.apache.myfaces.tobago.apt;
+
+/*
+ * Copyright 2002-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Document;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: bommel
+ * Date: 30.03.2006
+ * Time: 19:33:04
+ * To change this template use File | Settings | File Templates.
+ */
+public abstract class AbstractAnnotationVisitor extends AnnotationDeclarationVisitorCollector {
+  protected final AnnotationProcessorEnvironment env;
+
+  public AbstractAnnotationVisitor(AnnotationProcessorEnvironment env) {
+    this.env = env;
+  }
+
+  public AnnotationProcessorEnvironment getEnv() {
+    return env;
+  }
+
+  protected void addLeafTextElement(String text, String node, Element parent, Document document) {
+    Element element = document.createElement(node);
+    element.appendChild(document.createTextNode(text));
+    parent.appendChild(element);
+  }
+
+  protected void addLeafCDATAElement(String text, String node, Element parent, Document document) {
+    Element element = document.createElement(node);
+    element.appendChild(document.createCDATASection(text));
+    parent.appendChild(element);
+  }
+}