You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2006/09/25 17:41:30 UTC

svn commit: r449708 - in /myfaces/tobago/trunk/tobago-tool/gendoc: ./ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/myfaces/ src/main/java/org/apache/myfaces/tobago/ src/main/java/org/apache/myfaces/tobago/example...

Author: lofwyr
Date: Mon Sep 25 08:41:28 2006
New Revision: 449708

URL: http://svn.apache.org/viewvc?view=rev&rev=449708
Log:
cleanup module
adding basics for a tag viewer
working on more significant and helpful screenshots

Added:
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java   (with props)
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java   (with props)
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java   (with props)
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/demo.tld
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/index.jsp   (with props)
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp
      - copied, changed from r449652, myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/screenshot.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/tag-viewer.jsp   (with props)
Removed:
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/screenshot.jsp
Modified:
    myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tags/layout/screenshot.tag
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/box.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/button.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/in.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menucheck.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuradio.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/sheet.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/tabGroup.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarCheck.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarSelectOne.jsp
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeListBox.jsp

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml Mon Sep 25 08:41:28 2006
@@ -48,7 +48,6 @@
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-core</artifactId>
       <version>${project.version}</version>
-      <scope>compile</scope>
       <exclusions>
         <exclusion>
           <groupId>sun.jdk</groupId>
@@ -72,4 +71,77 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+    <profiles>
+    <profile>
+      <id>myfaces</id>
+      <activation>
+        <property>
+          <name>!jsf</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-api</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>jsf-provided</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>provided</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-api</artifactId>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.myfaces.core</groupId>
+          <artifactId>myfaces-impl</artifactId>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>sunjsf</id>
+      <activation>
+        <property>
+          <name>jsf</name>
+          <value>ri</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-api</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>javax.faces</groupId>
+          <artifactId>jsf-impl</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl</artifactId>
+          <scope>runtime</scope>
+        </dependency>
+      </dependencies>
+      <repositories>
+        <repository>
+          <id>java.net</id>
+          <name>java.net Maven 1 Repository</name>
+          <url>https://maven-repository.dev.java.net/repository</url>
+          <layout>legacy</layout>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+</project>

Added: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java?view=auto&rev=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java (added)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java Mon Sep 25 08:41:28 2006
@@ -0,0 +1,40 @@
+package org.apache.myfaces.tobago.example.reference;
+
+/*
+ * Copyright 2002-2006 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.
+ */
+
+public class AttributeData {
+
+  private String name;
+
+  private String value;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+}

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java?view=auto&rev=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java (added)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java Mon Sep 25 08:41:28 2006
@@ -0,0 +1,77 @@
+package org.apache.myfaces.tobago.example.reference;
+
+/*
+ * Copyright 2002-2006 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.component.InTag;
+import org.apache.myfaces.tobago.taglib.component.ButtonTag;
+import org.apache.myfaces.tobago.taglib.component.LinkTag;
+import org.apache.myfaces.tobago.taglib.extension.InExtensionTag;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.webapp.UIComponentTag;
+import javax.servlet.jsp.tagext.TagSupport;
+import java.util.List;
+import java.util.ArrayList;
+
+public class Controller {
+
+  private Log LOG = LogFactory.getLog(Controller.class);
+
+  private List<TagData> tags;
+
+  private List<AttributeData> attributes;
+
+  public Controller() {
+    tags = new ArrayList<TagData>();
+    TagData in = new TagData(InExtensionTag.class);
+    in.setName("In");
+    in.setTip("Ein In");
+    tags.add(in);
+    TagData button = new TagData(ButtonTag.class);
+    button.setName("Button");
+    button.setTip("Ein Knopf");
+    tags.add(button);
+    TagData link = new TagData(LinkTag.class);
+    link.setName("Link");
+    link.setTip("Ein Link");
+    tags.add(link);
+    attributes = new ArrayList<AttributeData>();
+  }
+
+  public TagSupport createTag() {
+    try {
+      Class clazz = tags.get(0).getTagClass();
+      InExtensionTag tag = (InExtensionTag) clazz.newInstance();
+      tag.setValue("Hallo Tester");
+      tag.setLabel("Label");
+      return tag;
+    } catch (Exception e) {
+      LOG.error("", e); // fixme
+      throw new RuntimeException(e);
+    }
+  }
+
+  public List<TagData> getTags() {
+    return tags;
+  }
+
+  public List<AttributeData> getAttributes() {
+    return attributes;
+  }
+}
+

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java?view=auto&rev=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java (added)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java Mon Sep 25 08:41:28 2006
@@ -0,0 +1,58 @@
+package org.apache.myfaces.tobago.example.reference;
+
+import org.apache.myfaces.tobago.util.VariableResolverUtil;
+
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.JspException;
+import javax.faces.webapp.UIComponentTag;
+import javax.faces.context.FacesContext;
+
+/*
+ * Copyright 2002-2006 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.
+ */
+
+public class DynamicTag extends TagSupport {
+
+  private String controllerName;
+  private TagSupport tag;
+
+  public int doStartTag() throws JspException {
+    // fixme: session?
+    Controller controller = (Controller) VariableResolverUtil.resolveVariable(FacesContext.getCurrentInstance(), controllerName);
+//    Controller controller = (Controller) pageContext.getSession().getAttribute(controllerName);
+    if (controller != null) {
+      tag = controller.createTag();
+      tag.setPageContext(pageContext);
+      tag.setParent(getParent());
+      tag.doStartTag();
+    }
+    return super.doStartTag();
+  }
+
+  public int doEndTag() throws JspException {
+    if (tag != null) {
+      tag.doEndTag();
+    }
+    return super.doEndTag();
+  }
+
+  public String getController() {
+    return controllerName;
+  }
+
+  public void setController(String controller) {
+    this.controllerName = controller;
+  }
+}

Added: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java?view=auto&rev=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java (added)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java Mon Sep 25 08:41:28 2006
@@ -0,0 +1,49 @@
+package org.apache.myfaces.tobago.example.reference;
+
+/*
+ * Copyright 2002-2006 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.
+ */
+
+public class TagData {
+
+  private Class clazz;
+  private String name;
+  private String tip;
+
+
+  public TagData(Class clazz) {
+    this.clazz = clazz;
+  }
+
+  public Class getTagClass() {
+    return clazz;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getTip() {
+    return tip;
+  }
+
+  public void setTip(String tip) {
+    this.tip = tip;
+  }
+}

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/demo.tld
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/demo.tld?view=auto&rev=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/demo.tld (added)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/demo.tld Mon Sep 25 08:41:28 2006
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+  <tlib-version>1.0</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>demo</short-name>
+  <uri>http://myfaces.apache.org/tobago/example/demo</uri>
+  <display-name>Demo</display-name>
+  <tag>
+    <name>dynamic</name>
+    <tag-class>org.apache.myfaces.tobago.example.reference.DynamicTag</tag-class>
+    <body-content>JSP</body-content>
+    <attribute>
+      <name>controller</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+</taglib>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/faces-config.xml Mon Sep 25 08:41:28 2006
@@ -38,7 +38,13 @@
 
   <managed-bean>
     <managed-bean-name>demo</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.tobago.demo.TobagoDemoController</managed-bean-class>
+    <managed-bean-class>org.apache.myfaces.tobago.example.demo.TobagoDemoController</managed-bean-class>
+    <managed-bean-scope>session</managed-bean-scope>
+  </managed-bean>
+
+  <managed-bean>
+    <managed-bean-name>reference</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.tobago.example.reference.Controller</managed-bean-class>
     <managed-bean-scope>session</managed-bean-scope>
   </managed-bean>
 

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tags/layout/screenshot.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tags/layout/screenshot.tag?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tags/layout/screenshot.tag (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tags/layout/screenshot.tag Mon Sep 25 08:41:28 2006
@@ -16,23 +16,17 @@
 <%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 
-
 <f:view>
+  <tc:loadBundle basename="demo" var="bundle"/>
 
-  <tc:loadBundle basename="demo" var="bundle" />
-  
   <tc:page label="Screenshot" id="page"
-    width="750px" height="800px">
+           width="750px" height="800px">
     <f:facet name="layout">
-      <tc:gridLayout columns="5px;1*" rows="5px;1*" />
+      <tc:gridLayout margin="5px"/>
     </f:facet>
 
-    <tc:cell/>
-    <tc:cell/>
-
-    <tc:cell/>
     <tc:panel>
-    <jsp:doBody/>
+      <jsp:doBody/>
     </tc:panel>
   </tc:page>
 </f:view>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml Mon Sep 25 08:41:28 2006
@@ -16,11 +16,10 @@
  *    limitations under the License.
 -->
 
-<!DOCTYPE web-app
-  	PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-  	"http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<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>Application to make screenshots from components</display-name>
 
@@ -56,5 +55,10 @@
     <servlet-name>ResourceServlet</servlet-name>
     <url-pattern>/org/apache/myfaces/tobago/renderkit/*</url-pattern>
   </servlet-mapping>
-  
+
+  <taglib>
+    <taglib-uri>http://myfaces.apache.org/tobago/example/demo</taglib-uri>
+    <taglib-location>/WEB-INF/demo.tld</taglib-location>
+  </taglib>
+
 </web-app>

Added: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/index.jsp?view=auto&rev=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/index.jsp (added)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/index.jsp Mon Sep 25 08:41:28 2006
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+   "http://www.w3.org/TR/html4/frameset.dtd">
+<html>
+<head>
+<title>Tobago</title>
+</head>
+<frameset cols="200,*">
+  <frame src="faces/navigation.jsp" name="Navigation">
+  <frame src="" name="View">
+  <noframes>
+    <body>
+      <p>Error: No frames.</p>
+    </body>
+  </noframes>
+</frameset>
+</html>
\ No newline at end of file

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp (from r449652, myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/screenshot.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp?view=diff&rev=449708&p1=myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/screenshot.jsp&r1=449652&p2=myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/screenshot.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp Mon Sep 25 08:41:28 2006
@@ -17,79 +17,96 @@
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 <%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
 
-<layout:screenshot>
-<jsp:body>
+<f:view>
 
-<tc:panel>
-  <f:facet name="layout">
-    <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;
-                        fixed;fixed;fixed;fixed;fixed;
-                        fixed;fixed;fixed;fixed;fixed;
-                        fixed;fixed;fixed;fixed;fixed;
-                        fixed;fixed;fixed;fixed;1*"/>
+  <tc:loadBundle basename="demo" var="bundle"/>
 
-  </f:facet>
+  <tc:page label="Screenshot" id="page"
+           width="200px" height="800px">
+    <f:facet name="layout">
+      <tc:gridLayout margin="5px"
+                     rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;1*"/>
+    </f:facet>
 
-  <tc:link type="navigate" action="box.jsp" immediate="true" label="Box" />
+    <tc:link link="screenshot/box.jsp" label="Box" target="View"/>
 
-  <tc:link type="navigate" action="button.jsp" immediate="true" label="Button" />
+    <tc:link link="screenshot/button.jsp" label="Button" target="View"/>
 
-  <tc:link type="navigate" action="date.jsp" immediate="true" label="Date" />
+    <tc:link link="screenshot/date.jsp"
+             label="Date" target="View"/>
 
-  <tc:link type="navigate" action="calendar.jsp" immediate="true" label="Calendar" />
+    <tc:link link="screenshot/calendar.jsp"
+             label="Calendar" target="View"/>
 
-  <tc:link type="navigate" action="file.jsp" immediate="true" label="File" />
+    <tc:link link="screenshot/file.jsp"
+             label="File" target="View"/>
 
-  <tc:link type="navigate" action="image.jsp" immediate="true" label="Image" />
+    <tc:link link="screenshot/image.jsp"
+             label="Image" target="View"/>
 
-  <tc:link type="navigate" action="in.jsp" immediate="true" label="In" />
+    <tc:link link="screenshot/in.jsp" label="In"
+             target="View"/>
 
-  <tc:link type="navigate" action="label.jsp" immediate="true" label="Label" />
+    <tc:link link="screenshot/label.jsp"
+             label="Label" target="View"/>
 
-  <tc:link type="navigate" action="link.jsp" immediate="true" label="Link" />
+    <tc:link link="screenshot/link.jsp"
+             label="Link" target="View"/>
 
-  <tc:link type="navigate" action="menuBar.jsp" immediate="true" label="Menubar" />
+    <tc:link link="screenshot/menuBar.jsp"
+             label="Menubar" target="View"/>
 
-  <tc:link type="navigate" action="menucheck.jsp" immediate="true" label="Menucheck" />
+    <tc:link link="screenshot/menucheck.jsp"
+             label="Menucheck" target="View"/>
 
-  <tc:link type="navigate" action="menuradio.jsp" immediate="true" label="Menuradio" />
+    <tc:link link="screenshot/menuradio.jsp"
+             label="Menuradio" target="View"/>
 
-  <tc:link type="navigate" action="messages.jsp" immediate="true" label="Messages" />
+    <tc:link link="screenshot/messages.jsp"
+             label="Messages" target="View"/>
 
-  <tc:link type="navigate" action="out.jsp" immediate="true" label="Out" />
+    <tc:link link="screenshot/out.jsp" label="Out"
+             target="View"/>
 
-  <tc:link type="navigate" action="progress.jsp" immediate="true" label="Progress" />
+    <tc:link link="screenshot/progress.jsp"
+             label="Progress" target="View"/>
 
-  <%--<tc:link type="navigate" action="richTextEditor.jsp" immediate="true" label="RichTextEditor" />--%>
+    <%--<tc:link link="screenshot/richTextEditor.jsp"  label="RichTextEditor"  target="View"/>--%>
 
-  <tc:link type="navigate" action="selectBooleanCheckbox.jsp" immediate="true" label="SelectBooleanCheckbox" />
+    <tc:link link="screenshot/selectBooleanCheckbox.jsp"
+             label="SelectBooleanCheckbox" target="View"/>
 
-  <tc:link type="navigate" action="selectManyListBox.jsp" immediate="true" label="SelectManyListbox" />
+    <tc:link link="screenshot/selectManyListBox.jsp"
+             label="SelectManyListbox" target="View"/>
 
-  <tc:link type="navigate" action="selectOneChoice.jsp" immediate="true" label="SelectOneChoice" />
+    <tc:link link="screenshot/selectOneChoice.jsp"
+             label="SelectOneChoice" target="View"/>
 
-  <tc:link type="navigate" action="selectOneListbox.jsp" immediate="true" label="SelectOneListbox" />
+    <tc:link link="screenshot/selectOneListbox.jsp"
+             label="SelectOneListbox" target="View"/>
 
-  <tc:link type="navigate" action="sheet.jsp" immediate="true" label="Sheet" />
+    <tc:link link="screenshot/sheet.jsp"
+             label="Sheet" target="View"/>
 
-  <%--<tc:link type="navigate" action="tabGroup.jsp" immediate="true" label="TabGroup" />--%>
+    <%--<tc:link link="screenshot/tabGroup.jsp"  label="TabGroup"  target="View"/>--%>
 
-  <tc:link type="navigate" action="textarea.jsp" immediate="true" label="Textarea" />
+    <tc:link link="screenshot/textarea.jsp"
+             label="Textarea" target="View"/>
 
-  <tc:link type="navigate" action="toolBar.jsp" immediate="true" label="ToolBar" />
+    <tc:link link="screenshot/toolBar.jsp"
+             label="ToolBar" target="View"/>
 
-  <%--<tc:link type="navigate" action="toolBarCheck.jsp" immediate="true" label="ToolBarCheck" />--%>
+    <%--<tc:link link="screenshot/toolBarCheck.jsp"  label="ToolBarCheck"  target="View"/>--%>
 
-  <%--<tc:link type="navigate" action="toolBarSelectOne.jsp" immediate="true" label="TooBarSelectOne" />--%>
+    <%--<tc:link link="screenshot/toolBarSelectOne.jsp"  label="TooBarSelectOne"  target="View"/>--%>
 
-  <tc:link type="navigate" action="tree.jsp" immediate="true" label="Tree" />
+    <tc:link link="screenshot/tree.jsp"
+             label="Tree" target="View"/>
 
-  <tc:link type="navigate" action="treeListBox.jsp" immediate="true" label="TreeListBox" />
+    <tc:link link="screenshot/treeListBox.jsp"
+             label="TreeListBox" target="View"/>
 
 
-  <tc:cell/>
-
-</tc:panel>
-
-</jsp:body>
-</layout:screenshot>
+    <tc:cell/>
+  </tc:page>
+</f:view>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/box.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/box.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/box.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/box.jsp Mon Sep 25 08:41:28 2006
@@ -1,4 +1,3 @@
-
 <%--
  * Copyright 2002-2005 The Apache Software Foundation.
  *
@@ -19,23 +18,19 @@
 <%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
 
 <layout:screenshot>
-<jsp:body>
-  <f:subview id="image">
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout rows="200px;1*" columns="400px;1*" />
-      </f:facet>
-<%-- code-sniplet-start id="box" --%>
-<tc:box label="Groupbox Headline">
-
-</tc:box>
-<%-- code-sniplet-end id="box" --%>
-
-      <tc:cell/>
-      <tc:cell/>
-      <tc:cell/>
-
+  <jsp:body>
+    <f:subview id="image">
+      <tc:panel>
+        <f:facet name="layout">
+          <tc:gridLayout columns="400px;*" rows="200px;*"/>
+        </f:facet>
+        <%-- code-sniplet-start id="box" --%>
+        <tc:box label="Groupbox Headline">
+        </tc:box>
+        <%-- code-sniplet-end id="box" --%>
+        <tc:cell/>
+        <tc:cell spanX="2"/>
       </tc:panel>
     </f:subview>
-</jsp:body>
-</layout:screenshot>
\ No newline at end of file
+  </jsp:body>
+</layout:screenshot>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/button.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/button.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/button.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/button.jsp Mon Sep 25 08:41:28 2006
@@ -22,17 +22,14 @@
     <f:subview id="button">
       <tc:panel>
         <f:facet name="layout">
-          <tc:gridLayout columns="100px;1*" rows="fixed;1*" />
+          <tc:gridLayout columns="100px;*" rows="fixed;*" />
         </f:facet>
-<%-- code-sniplet-start id="button" --%>
-        <tc:button label="Save" />
-<%-- code-sniplet-end id="button" --%>
+        <%-- code-sniplet-start id="button" --%>
+        <tc:button label="Submit"/>
+        <%-- code-sniplet-end id="button" --%>
         <tc:cell/>
-
         <tc:cell spanX="2"/>
-
       </tc:panel>
-
     </f:subview>
   </jsp:body>
 </layout:screenshot>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/in.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/in.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/in.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/in.jsp Mon Sep 25 08:41:28 2006
@@ -22,11 +22,31 @@
   <jsp:body>
     <tc:panel>
       <f:facet name="layout">
-        <tc:gridLayout columns="300px;1*" rows="fixed;1*" />
+        <tc:gridLayout columns="300px;1*"
+                       rows="fixed;fixed;fixed;fixed;fixed;1*"/>
       </f:facet>
-<%-- code-sniplet-start id="in" --%>
-      <tx:in label="Credit Card No.:" />
-<%-- code-sniplet-end id="in" --%>      
+      <%-- code-sniplet-start id="in" --%>
+      <tx:in label="Input" value="Some Text"/>
+      <%-- code-sniplet-end id="in" --%>
+      <tc:cell/>
+
+      <tx:in label="Read Only" readonly="true" value="Some Text"/>
+      <tc:cell/>
+
+      <tx:in label="Disabled" disabled="true" value="Some Text"/>
+      <tc:cell/>
+
+      <tc:panel>
+        <f:facet name="layout">
+          <tc:gridLayout columns="100px;*"/>
+        </f:facet>
+        <tc:label value="Short Label"/>
+        <tc:in value="Some Text"/>
+      </tc:panel>
+      <tc:cell/>
+
+      <%--fixme!!!--%>
+      <tx:in label="Has Focus (FIXME)" focus="true" value="Some Text"/>
       <tc:cell/>
 
       <tc:cell spanX="2"/>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menucheck.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menucheck.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menucheck.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menucheck.jsp Mon Sep 25 08:41:28 2006
@@ -12,4 +12,5 @@
  *    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.
---%>
\ No newline at end of file
+--%>
+todo
\ No newline at end of file

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuradio.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuradio.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuradio.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuradio.jsp Mon Sep 25 08:41:28 2006
@@ -12,4 +12,5 @@
  *    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.
---%>
\ No newline at end of file
+--%>
+todo
\ No newline at end of file

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/sheet.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/sheet.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/sheet.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/sheet.jsp Mon Sep 25 08:41:28 2006
@@ -13,3 +13,4 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
 --%>
+todo

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/tabGroup.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/tabGroup.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/tabGroup.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/tabGroup.jsp Mon Sep 25 08:41:28 2006
@@ -12,4 +12,5 @@
  *    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.
---%>
\ No newline at end of file
+--%>
+todo

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarCheck.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarCheck.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarCheck.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarCheck.jsp Mon Sep 25 08:41:28 2006
@@ -12,4 +12,5 @@
  *    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.
---%>
\ No newline at end of file
+--%>
+todo

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarSelectOne.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarSelectOne.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarSelectOne.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/toolBarSelectOne.jsp Mon Sep 25 08:41:28 2006
@@ -12,4 +12,5 @@
  *    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.
---%>
\ No newline at end of file
+--%>
+todo

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeListBox.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeListBox.jsp?view=diff&rev=449708&r1=449707&r2=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeListBox.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeListBox.jsp Mon Sep 25 08:41:28 2006
@@ -12,4 +12,5 @@
  *    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.
---%>
\ No newline at end of file
+--%>
+todo

Added: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/tag-viewer.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/tag-viewer.jsp?view=auto&rev=449708
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/tag-viewer.jsp (added)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/tag-viewer.jsp Mon Sep 25 08:41:28 2006
@@ -0,0 +1,59 @@
+<%--
+ * Copyright 2002-2006 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.
+--%>
+<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
+<%@ taglib uri="http://myfaces.apache.org/tobago/example/demo" prefix="demo" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
+
+<f:view>
+
+  <tc:page label="Tag Viewer" id="page"
+           width="1000px" height="500px">
+    <f:facet name="layout">
+      <tc:gridLayout columns="*;*;2*" margin="5px"/>
+    </f:facet>
+
+    <tc:box label="Tag">
+      <f:facet name="layout">
+        <tc:gridLayout rows="*" columns="*"/>
+      </f:facet>
+      <tc:sheet var="tag" columns="*" value="#{reference.tags}">
+        <tc:column label="Name">
+          <tc:out value="#{tag.name}" tip="#{tag.tip}"/>
+        </tc:column>
+      </tc:sheet>
+    </tc:box>
+    <tc:box label="Attribute">
+      <f:facet name="layout">
+        <tc:gridLayout rows="*" columns="*"/>
+      </f:facet>
+      <tc:sheet var="attribute" columns="*;*" value="#{reference.attributes}">
+        <tc:column label="Name">
+          <tc:out value="#{attribute.name}"/>
+        </tc:column>
+        <tc:column label="Value">
+          <tc:out value="#{attribute.name}"/>
+        </tc:column>
+      </tc:sheet>
+    </tc:box>
+    <tc:box label="View">
+      <f:facet name="layout">
+        <tc:gridLayout rows="*" columns="*"/>
+      </f:facet>
+      <demo:dynamic controller="reference" />
+    </tc:box>
+  </tc:page>
+</f:view>

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/tag-viewer.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/tag-viewer.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL