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 2008/11/21 16:50:58 UTC
svn commit: r719606 [1/2] - in /myfaces/tobago/trunk/example/demo: ./
src/main/java/org/apache/myfaces/tobago/example/demo/
src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/
src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/WEB...
Author: lofwyr
Date: Fri Nov 21 07:50:48 2008
New Revision: 719606
URL: http://svn.apache.org/viewvc?rev=719606&view=rev
Log:
TOBAGO-723: Using the demo with Faceles and JSPX
The JSPX Files will be generated, the JSP files will be removed
Added:
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguage.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguageBean.java
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tagx
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tagx (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.xhtml (contents, props changed)
- copied, changed from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.jsp
myfaces/tobago/trunk/example/demo/src/main/xslt/
myfaces/tobago/trunk/example/demo/src/main/xslt/facelet2jsp.xsl
Removed:
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tab.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/theme.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/validation.jsp
Modified:
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Fri Nov 21 07:50:48 2008
@@ -68,20 +68,26 @@
<url>http://localhost:8080/manager</url>
</configuration>
</plugin>
- <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xslt-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<srcDir>src/main/webapp/overview</srcDir>
<destDir>target/tobago-example-demo/overview</destDir>
<xslFile>src/main/xslt/facelet2jsp.xsl</xslFile>
<srcIncludes>*.xhtml</srcIncludes>
<fileNameRegex>(.*).xhtml</fileNameRegex>
- <fileNameReplacement>$1.jsp</fileNameReplacement>
+ <fileNameReplacement>$1.jspx</fileNameReplacement>
</configuration>
</plugin>
- -->
</plugins>
</build>
<scm>
Added: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java?rev=719606&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java (added)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java Fri Nov 21 07:50:48 2008
@@ -0,0 +1,74 @@
+package org.apache.myfaces.tobago.example.demo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.util.VariableResolverUtil;
+import org.apache.myfaces.tobago.context.ResourceManagerUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.application.NavigationHandler;
+import javax.faces.context.FacesContext;
+
+public class MultiplePageDeclarationLanguageNavigationHandler extends NavigationHandler {
+
+ private static final Log LOG = LogFactory.getLog(MultiplePageDeclarationLanguageNavigationHandler.class);
+
+ private NavigationHandler navigationHandler;
+
+ public MultiplePageDeclarationLanguageNavigationHandler(NavigationHandler navigationHandler) {
+ this.navigationHandler = navigationHandler;
+ }
+
+ public void handleNavigation(FacesContext facesContext, String fromAction, String outcome) {
+
+ LOG.info("outcome='"+ outcome + "'");
+
+ if (outcome != null) {
+ PageDeclarationLanguageBean bean
+ = (PageDeclarationLanguageBean) VariableResolverUtil.resolveVariable(facesContext, "pageDeclarationLanguage");
+
+ for (PageDeclarationLanguage renderTechnologie : PageDeclarationLanguage.values()) {
+ if (outcome.endsWith(renderTechnologie.getExtension())) {
+ outcome = outcome.substring(0, outcome.lastIndexOf(renderTechnologie.getExtension()));
+ }
+ }
+
+ if (pageExists(facesContext, outcome, bean.getLanguage().getExtension())) {
+ outcome = outcome + bean.getLanguage().getExtension();
+ } else {
+ for (PageDeclarationLanguage renderTechnologie : PageDeclarationLanguage.values()) {
+ if (pageExists(facesContext, outcome, renderTechnologie.getExtension())) {
+ bean.setLanguage(renderTechnologie);
+ outcome = outcome + bean.getLanguage().getExtension();
+ break;
+ }
+ }
+ }
+ }
+
+ LOG.info("outcome='"+ outcome + "'");
+
+ navigationHandler.handleNavigation(facesContext, fromAction, outcome);
+ }
+
+ private boolean pageExists(FacesContext facesContext, String outcome, String extension) {
+ String path = ResourceManagerUtil.getImageWithPath(facesContext, outcome.substring(1) + extension, true);
+ return path != null;
+ }
+}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java Fri Nov 21 07:50:48 2008
@@ -50,19 +50,19 @@
tree = new DefaultMutableTreeNode(new Node("Root", null));
- DefaultMutableTreeNode overview = new DefaultMutableTreeNode(new Node("overview", "overview/intro"));
+ DefaultMutableTreeNode overview = new DefaultMutableTreeNode(new Node("overview", "/overview/intro"));
// overview.add(new DefaultMutableTreeNode(new Node("intro", "overview/intro")));
- overview.add(new DefaultMutableTreeNode(new Node("basic", "overview/basic.jsp")));
- overview.add(new DefaultMutableTreeNode(new Node("sheet", "overview/sheet")));
- overview.add(new DefaultMutableTreeNode(new Node("tree", "overview/tree")));
- overview.add(new DefaultMutableTreeNode(new Node("tab", "overview/tab")));
- overview.add(new DefaultMutableTreeNode(new Node("toolbar", "overview/toolbar")));
- overview.add(new DefaultMutableTreeNode(new Node("validation", "overview/validation")));
- overview.add(new DefaultMutableTreeNode(new Node("form", "overview/form")));
- overview.add(new DefaultMutableTreeNode(new Node("themes", "overview/themes")));
- overview.add(new DefaultMutableTreeNode(new Node("browser", "overview/browser")));
- overview.add(new DefaultMutableTreeNode(new Node("locale", "overview/locale")));
- overview.add(new DefaultMutableTreeNode(new Node("layout", "overview/layout")));
+ overview.add(new DefaultMutableTreeNode(new Node("basic", "/overview/basic")));
+ overview.add(new DefaultMutableTreeNode(new Node("sheet", "/overview/sheet")));
+ overview.add(new DefaultMutableTreeNode(new Node("tree", "/overview/tree")));
+ overview.add(new DefaultMutableTreeNode(new Node("tab", "/overview/tab")));
+ overview.add(new DefaultMutableTreeNode(new Node("toolbar", "/overview/toolbar")));
+ overview.add(new DefaultMutableTreeNode(new Node("validation", "/overview/validation")));
+ overview.add(new DefaultMutableTreeNode(new Node("form", "/overview/form")));
+ overview.add(new DefaultMutableTreeNode(new Node("theme", "/overview/theme")));
+ overview.add(new DefaultMutableTreeNode(new Node("browser", "/overview/browser")));
+ overview.add(new DefaultMutableTreeNode(new Node("locale", "/overview/locale")));
+ overview.add(new DefaultMutableTreeNode(new Node("layout", "/overview/layout")));
tree.add(overview);
DefaultMutableTreeNode bestPractice = new DefaultMutableTreeNode(new Node("bestPractice", "best-practice/intro"));
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Node.java Fri Nov 21 07:50:48 2008
@@ -19,6 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.event.TreeExpansionEvent;
public class Node {
@@ -48,6 +49,11 @@
return null;
}
+ public void expansionListener(TreeExpansionEvent event) {
+ LOG.info("event='" + event + "'");
+ expanded = event.isNewExpanded();
+ }
+
public String getName() {
return name;
}
Added: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguage.java?rev=719606&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguage.java (added)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguage.java Fri Nov 21 07:50:48 2008
@@ -0,0 +1,41 @@
+package org.apache.myfaces.tobago.example.demo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 enum PageDeclarationLanguage {
+
+ FACELETS(".xhtml", "Facelet"),
+ JSPX(".jspx", "JSPX"),
+ JSP(".jsp", "JSP");
+
+ private String extension;
+ private String display;
+
+ PageDeclarationLanguage(String extension, String display) {
+ this.extension = extension;
+ this.display = display;
+ }
+
+ public String getExtension() {
+ return extension;
+ }
+
+ public String getDisplay() {
+ return display;
+ }
+}
Added: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguageBean.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguageBean.java?rev=719606&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguageBean.java (added)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguageBean.java Fri Nov 21 07:50:48 2008
@@ -0,0 +1,52 @@
+package org.apache.myfaces.tobago.example.demo;
+
+import javax.faces.context.FacesContext;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 PageDeclarationLanguageBean {
+
+ private PageDeclarationLanguage language = PageDeclarationLanguage.FACELETS;
+
+ public PageDeclarationLanguage getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(PageDeclarationLanguage language) {
+ this.language = language;
+ }
+
+ public String asFacelets() {
+ language = PageDeclarationLanguage.FACELETS;
+ return FacesContext.getCurrentInstance().getViewRoot().getViewId();
+
+ }
+
+ public String asJspx() {
+ language = PageDeclarationLanguage.JSPX;
+ return FacesContext.getCurrentInstance().getViewRoot().getViewId();
+ }
+
+ public boolean isFacelets() {
+ return language == PageDeclarationLanguage.FACELETS;
+ }
+
+ public boolean isJspx() {
+ return language == PageDeclarationLanguage.JSPX;
+ }
+}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Fri Nov 21 07:50:48 2008
@@ -238,7 +238,7 @@
String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
int end = viewId.lastIndexOf(".xhtml");
if (end >= 0) {
- return viewId.substring(1, end) + ".jsp";
+ return viewId.substring(1, end) + ".jspx";
}
LOG.warn("Can't create the outcome");
return null;
@@ -246,7 +246,7 @@
public String asFacelet() {
String viewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
- int end = viewId.lastIndexOf(".jsp");
+ int end = viewId.lastIndexOf(".jspx");
if (end >= 0) {
return viewId.substring(1, end) + ".xhtml";
}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java Fri Nov 21 07:50:48 2008
@@ -100,7 +100,7 @@
}
}
- return "view";
+ return FacesContext.getCurrentInstance().getViewRoot().getViewId();
}
// ///////////////////////////////////////////// logic
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/classes/log4j.xml Fri Nov 21 07:50:48 2008
@@ -21,22 +21,12 @@
<log4j:configuration>
- <appender name="logfile" class="org.apache.log4j.FileAppender">
- <param name="File" value="tobago-example-demo.log" />
- <param name="Append" value="true" />
- <param name="Encoding" value="UTF-8" />
+ <appender name="logfile" class="org.apache.log4j.ConsoleAppender">
+ <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.
- -->
+ value="%d{HH:mm:ss} %-5p %-50.50c:%-20.20M:%-4.4L %m%n"/>
+ <!-- See http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html -->
</layout>
</appender>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml Fri Nov 21 07:50:48 2008
@@ -27,6 +27,9 @@
<view-handler>
com.sun.facelets.FaceletViewHandler
</view-handler>
+ <navigation-handler>
+ org.apache.myfaces.tobago.example.demo.MultiplePageDeclarationLanguageNavigationHandler
+ </navigation-handler>
<locale-config>
<default-locale>en</default-locale>
<supported-locale>en_US</supported-locale>
@@ -93,6 +96,12 @@
</managed-property>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>pageDeclarationLanguage</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.tobago.example.demo.PageDeclarationLanguageBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
<navigation-rule>
<navigation-case>
<from-outcome>server-info</from-outcome>
@@ -108,74 +117,103 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <!-- the jspx files will be generated -->
<navigation-rule>
<navigation-case>
- <from-outcome>overview/intro</from-outcome>
- <to-view-id>/overview/intro.jsp</to-view-id>
+ <from-outcome>/overview/intro.jspx</from-outcome>
+ <to-view-id>/overview/intro.jspx</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/basic.jsp</from-outcome>
- <to-view-id>/overview/basic.jsp</to-view-id>
+ <from-outcome>/overview/intro.xhtml</from-outcome>
+ <to-view-id>/overview/intro.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/basic.xhtml</from-outcome>
+ <from-outcome>/overview/basic.jspx</from-outcome>
+ <to-view-id>/overview/basic.jspx</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/basic.xhtml</from-outcome>
<to-view-id>/overview/basic.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/sheet</from-outcome>
- <to-view-id>/overview/sheet.jsp</to-view-id>
+ <from-outcome>/overview/sheet.jspx</from-outcome>
+ <to-view-id>/overview/sheet.jspx</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/tree</from-outcome>
- <to-view-id>/overview/tree.jsp</to-view-id>
+ <from-outcome>/overview/sheet.xhtml</from-outcome>
+ <to-view-id>/overview/sheet.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/tab</from-outcome>
- <to-view-id>/overview/tab.jsp</to-view-id>
+ <from-outcome>/overview/tree.jspx</from-outcome>
+ <to-view-id>/overview/tree.jspx</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/toolbar</from-outcome>
- <to-view-id>/overview/toolbar.jsp</to-view-id>
+ <from-outcome>/overview/tree.xhtml</from-outcome>
+ <to-view-id>/overview/tree.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/validation</from-outcome>
- <to-view-id>/overview/validation.jsp</to-view-id>
+ <from-outcome>/overview/tab.jspx</from-outcome>
+ <to-view-id>/overview/tab.jspx</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/form</from-outcome>
- <to-view-id>/overview/form.jsp</to-view-id>
+ <from-outcome>/overview/tab.xhtml</from-outcome>
+ <to-view-id>/overview/tab.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/themes</from-outcome>
- <to-view-id>/overview/theme.jsp</to-view-id>
+ <from-outcome>/overview/toolbar.jspx</from-outcome>
+ <to-view-id>/overview/toolbar.jspx</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/browser</from-outcome>
- <to-view-id>/overview/browser.jsp</to-view-id>
+ <from-outcome>/overview/toolbar.xhtml</from-outcome>
+ <to-view-id>/overview/toolbar.xhtml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/locale</from-outcome>
- <to-view-id>/overview/locale.jsp</to-view-id>
+ <from-outcome>/overview/validation.jspx</from-outcome>
+ <to-view-id>/overview/validation.jspx</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>overview/layout</from-outcome>
- <to-view-id>/overview/layout.jsp</to-view-id>
+ <from-outcome>/overview/validation.xhtml</from-outcome>
+ <to-view-id>/overview/validation.xhtml</to-view-id>
</navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/overview/theme.jsp</from-view-id>
<navigation-case>
- <from-action>#{clientConfigController.submit}</from-action>
- <to-view-id>/overview/theme.jsp</to-view-id>
+ <from-outcome>/overview/form.jspx</from-outcome>
+ <to-view-id>/overview/form.jspx</to-view-id>
</navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/overview/locale.jsp</from-view-id>
<navigation-case>
- <from-action>#{clientConfigController.submit}</from-action>
- <to-view-id>/overview/locale.jsp</to-view-id>
+ <from-outcome>/overview/form.xhtml</from-outcome>
+ <to-view-id>/overview/form.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/theme.jspx</from-outcome>
+ <to-view-id>/overview/theme.jspx</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/theme.xhtml</from-outcome>
+ <to-view-id>/overview/theme.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/browser.jspx</from-outcome>
+ <to-view-id>/overview/browser.jspx</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/browser.xhtml</from-outcome>
+ <to-view-id>/overview/browser.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/locale.jspx</from-outcome>
+ <to-view-id>/overview/locale.jspx</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/locale.xhtml</from-outcome>
+ <to-view-id>/overview/locale.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/layout.jspx</from-outcome>
+ <to-view-id>/overview/layout.jspx</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>/overview/layout.xhtml</from-outcome>
+ <to-view-id>/overview/layout.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Added: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tagx
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tagx?rev=719606&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tagx (added)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tagx Fri Nov 21 07:50:48 2008
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+-->
+
+<jsp:root version="2.0"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:layout="/WEB-INF/tags/layout"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <jsp:directive.attribute name="title"/>
+ <f:view locale="#{clientConfigController.locale}">
+ <tc:loadBundle basename="overview" var="overviewBundle"/>
+ <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle} - #{title}" id="page" width="1000px"
+ height="750px">
+ <!-- fixme: #{title} will not evaluated correctly, because it will be evaluated "late", but too late
+ fixme: and ${title} is not allowed, because it can't be provided with JSF 1.2 -->
+ <jsp:include page="/menu.jsp"/>
+ <f:facet name="layout">
+ <tc:gridLayout border="0" columns="*;4*"
+ margin="10px" rows="100px;*;fixed"/>
+ </f:facet>
+
+ <tc:cell spanX="2">
+ <jsp:include page="/header.jsp"/>
+ </tc:cell>
+
+ <tc:cell spanY="2">
+ <jsp:include page="/navigation.jsp"/>
+ </tc:cell>
+
+ <tc:cell>
+ <jsp:doBody/>
+ </tc:cell>
+
+ <tc:cell>
+ <jsp:include page="/footer.jsp"/>
+ </tc:cell>
+
+ </tc:page>
+ </f:view>
+</jsp:root>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.xhtml Fri Nov 21 07:50:48 2008
@@ -23,7 +23,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<f:view locale="#{clientConfigController.locale}">
<tc:loadBundle basename="overview" var="overviewBundle"/>
- <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page" width="1000px"
+ <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle} - #{title}" id="page" width="1000px"
height="750px">
<ui:include src="/menu.xhtml"/>
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tagx (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tagx?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tagx&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tag (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tagx Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,19 +15,26 @@
* 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://java.sun.com/jsf/core" prefix="f" %>
+-->
-<f:view locale="#{clientConfigController.locale}">
- <tc:loadBundle basename="overview" var="overviewBundle"/>
- <tc:page label="Test" id="page" width="1000px" height="750px">
- <f:facet name="layout">
- <tc:gridLayout/>
- </f:facet>
+<jsp:root version="2.0"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:layout="/WEB-INF/tags/layout"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <jsp:directive.attribute name="title"/>
+ <f:view locale="#{clientConfigController.locale}">
+ <tc:loadBundle basename="overview" var="overviewBundle"/>
+ <tc:page label="Test" id="page" width="1000px" height="750px">
+ <f:facet name="layout">
+ <tc:gridLayout/>
+ </f:facet>
- <jsp:doBody/>
+ <jsp:doBody/>
- </tc:page>
-</f:view>
+ </tc:page>
+ </f:view>
+</jsp:root>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tagx
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tagx
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/plain.tagx
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp Fri Nov 21 07:50:48 2008
@@ -45,11 +45,11 @@
immediate="true" label="#{overviewBundle.footer_viewSource}"
target="Source Viewer" transition="false"/>
- <tc:button action="#{demo.asJsp}" disabled="#{demo.jsp}" rendered="#{demo.doubleDefined}" immediate="true"
- label="As JSP" tip="Use JSP as render technologie"/>
+ <tc:button action="#{pageDeclarationLanguage.asJspx}" disabled="#{pageDeclarationLanguage.jspx}"
+ immediate="true" label="As JSP" tip="Use JSP as render technologie"/>
- <tc:button action="#{demo.asFacelet}" disabled="#{! demo.jsp}" rendered="#{demo.doubleDefined}" immediate="true"
- label="As Facelet" tip="Use Facelets as render technologie"/>
+ <tc:button action="#{pageDeclarationLanguage.asFacelets}" disabled="#{pageDeclarationLanguage.facelets}"
+ immediate="true" label="As Facelet" tip="Use Facelets as render technologie"/>
<tc:out value="#{overviewBundle.notTranslated}"/>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/footer.xhtml Fri Nov 21 07:50:48 2008
@@ -49,11 +49,11 @@
immediate="true" label="#{overviewBundle.footer_viewSource}"
target="Source Viewer" transition="false"/>
- <tc:button action="#{demo.asJsp}" disabled="#{demo.jsp}" rendered="#{demo.doubleDefined}" immediate="true"
- label="As JSP" tip="Use JSP as render technologie"/>
+ <tc:button action="#{pageDeclarationLanguage.asJspx}" disabled="#{pageDeclarationLanguage.jspx}"
+ immediate="true" label="As JSP" tip="Use JSP as render technologie"/>
- <tc:button action="#{demo.asFacelet}" disabled="#{! demo.jsp}" rendered="#{demo.doubleDefined}" immediate="true"
- label="As Facelet" tip="Use Facelets as render technologie"/>
+ <tc:button action="#{pageDeclarationLanguage.asFacelets}" disabled="#{pageDeclarationLanguage.facelets}"
+ immediate="true" label="As Facelet" tip="Use Facelets as render technologie"/>
<tc:out value="#{overviewBundle.notTranslated}"/>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/header.jsp Fri Nov 21 07:50:48 2008
@@ -39,7 +39,7 @@
</f:facet>
<tc:out value="#{clientConfigController.localizedTheme}"/>
<tc:out value="#{clientConfigController.localizedLocale}"/>
- <tc:out value="#{demo.jsp ? 'JSP' : 'Facelet'}"/>
+ <tc:out value="JSP/JSPX"/>
<tc:cell/>
</tc:panel>
</tc:panel>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/header.xhtml Fri Nov 21 07:50:48 2008
@@ -38,7 +38,7 @@
</f:facet>
<tc:out value="#{clientConfigController.localizedTheme}"/>
<tc:out value="#{clientConfigController.localizedLocale}"/>
- <tc:out value="#{demo.jsp ? 'JSP' : 'Facelet'}"/>
+ <tc:out value="Facelets"/>
<tc:cell/>
</tc:panel>
</tc:panel>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/index.jsp Fri Nov 21 07:50:48 2008
@@ -14,4 +14,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<jsp:forward page="overview/intro.jsf"/>
+<jsp:forward page="faces/overview/intro.xhtml"/>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml?rev=719606&r1=719605&r2=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml Fri Nov 21 07:50:48 2008
@@ -24,7 +24,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:param name="title" value="Basics"/>
+ <ui:param name="title" value="#{overviewBundle.basic}"/>
<tc:box label="#{overviewBundle.basic}">
<!--
@@ -128,15 +128,15 @@
<f:facet name="layout">
<tc:gridLayout columns="120px;*;120px;*;120px" rows="fixed;fixed" border="0"/>
</f:facet>
- <tc:link id="link" action="overview/basic.xhtml"
+ <tc:link id="link" action="/overview/basic"
actionListener="#{overviewController.click}"
label="#{overviewBundle.basic_linkAction}" />
<tc:cell/>
- <tc:link id="image" action="overview/basic.xhtml"
+ <tc:link id="image" action="/overview/basic"
actionListener="#{overviewController.click}"
image="image/image_button.gif" />
<tc:cell/>
- <tc:button id="button" action="overview/basic.xhtml"
+ <tc:button id="button" action="/overview/basic"
actionListener="#{overviewController.click}"
label="#{overviewBundle.basic_buttonAction}" />
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,13 +15,15 @@
* 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://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
+-->
-<layout:overview>
- <jsp:body>
- <tc:out escape="false" value="#{overviewBundle.browser_text}" />
- </jsp:body>
-</layout:overview>
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.browser}"/>
+ <tc:out escape="false" value="#{overviewBundle.browser_text}"/>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/browser.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,69 +15,70 @@
* 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/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-
-<layout:overview>
- <jsp:body>
- <tc:panel>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.form}"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout/>
+ </f:facet>
+
+ <!--
+ <tc:out escape="false" value="#{overviewBundle.form_text1}" />
+ -->
+
+ <tc:box label="#{overviewBundle.form_outTitle}">
<f:facet name="layout">
- <tc:gridLayout />
+ <tc:gridLayout rows="80px;fixed;fixed;fixed"/>
</f:facet>
- <%--
- <tc:out escape="false" value="#{overviewBundle.form_text1}" />
- --%>
+ <tc:out escape="false" value="#{overviewBundle.form_text2}"/>
- <tc:box label="#{overviewBundle.form_outTitle}">
+ <tc:box label="#{overviewBundle.form_in1Title}">
<f:facet name="layout">
- <tc:gridLayout rows="80px;fixed;fixed;fixed" />
+ <tc:gridLayout rows="fixed;fixed;" columns="1*;100px"/>
</f:facet>
- <tc:out escape="false" value="#{overviewBundle.form_text2}" />
+ <tc:form id="form1">
+ <tx:in value="#{demo.text[0]}" required="true" label="#{overviewBundle.newValue1}"/>
+ <tc:cell spanY="2">
+ <tc:button label="#{overviewBundle.submitForm1}"/>
+ </tc:cell>
+ <tx:in value="#{demo.text[0]}" readonly="true" label="#{overviewBundle.modelValue1}"/>
+ </tc:form>
+
+ </tc:box>
+
+ <tc:box label="#{overviewBundle.form_in2Title}">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed" columns="1*;100px"/>
+ </f:facet>
- <tc:box label="#{overviewBundle.form_in1Title}">
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;" columns="1*;100px" />
- </f:facet>
-
- <tc:form id="form1" >
- <tx:in value="#{demo.text[0]}" required="true" label="#{overviewBundle.newValue1}" />
- <tc:cell spanY="2" >
- <tc:button label="#{overviewBundle.submitForm1}" />
- </tc:cell>
- <tx:in value="#{demo.text[0]}" readonly="true" label="#{overviewBundle.modelValue1}" />
- </tc:form>
-
- </tc:box>
-
- <tc:box label="#{overviewBundle.form_in2Title}">
- <f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed" columns="1*;100px"/>
- </f:facet>
-
- <tc:form id="form2">
- <tx:in value="#{demo.text[1]}" required="true" label="#{overviewBundle.newValue2}" />
- <tc:cell spanY="2" >
- <tc:button label="#{overviewBundle.submitForm2}" />
- </tc:cell>
- <tx:in value="#{demo.text[1]}" readonly="true" label="#{overviewBundle.modelValue2}" />
- </tc:form>
- </tc:box>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;fixed" rows="fixed;*" />
- </f:facet>
-
- <tc:cell/>
- <tc:button label="#{overviewBundle.submitAll}" />
- <tc:cell spanX="2" />
- </tc:panel>
+ <tc:form id="form2">
+ <tx:in value="#{demo.text[1]}" required="true" label="#{overviewBundle.newValue2}"/>
+ <tc:cell spanY="2">
+ <tc:button label="#{overviewBundle.submitForm2}"/>
+ </tc:cell>
+ <tx:in value="#{demo.text[1]}" readonly="true" label="#{overviewBundle.modelValue2}"/>
+ </tc:form>
</tc:box>
- </tc:panel>
- </jsp:body>
-</layout:overview>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;fixed" rows="fixed;*"/>
+ </f:facet>
+
+ <tc:cell/>
+ <tc:button label="#{overviewBundle.submitAll}"/>
+ <tc:cell spanX="2"/>
+ </tc:panel>
+ </tc:box>
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/form.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,13 +15,15 @@
* 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://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
+-->
-<layout:overview>
- <jsp:body>
- <tc:out escape="false" value="#{overviewBundle.intro_text}" />
- </jsp:body>
-</layout:overview>
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.intro}"/>
+ <tc:out escape="false" value="#{overviewBundle.intro_text}"/>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/intro.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,50 +15,51 @@
* 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/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-
-<layout:overview>
- <jsp:body>
- <tc:panel>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.layout}"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="2*;7*"/>
+ </f:facet>
+
+ <tc:out escape="false" value="#{overviewBundle.layout_text}"/>
+ <!-- code-sniplet-start id="layoutManagementExample" -->
+ <tc:box label="#{overviewBundle.layout_exampleTitle}">
<f:facet name="layout">
- <tc:gridLayout rows="2*;7*" />
+ <tc:gridLayout columns="1*;1*" rows="fixed;fixed;fixed;fixed;fixed;*"/>
</f:facet>
-
- <tc:out escape="false" value="#{overviewBundle.layout_text}" />
-<%-- code-sniplet-start id="layoutManagementExample" --%>
- <tc:box label="#{overviewBundle.layout_exampleTitle}">
- <f:facet name="layout">
- <tc:gridLayout columns="1*;1*" rows="fixed;fixed;fixed;fixed;fixed;*"/>
- </f:facet>
- <tx:selectOneChoice value="#{overviewController.singleValue}"
- label="#{overviewBundle.layout_salutation}"
- converter="salutationId" >
- <f:selectItems value="#{overviewController.items}" />
- </tx:selectOneChoice>
- <tc:cell/>
-
- <tx:in value="" label="#{overviewBundle.layout_firstName}" />
- <tx:in value="" label="#{overviewBundle.layout_lastName}" />
-
- <tc:cell spanX="2">
- <tx:in value="" label="#{overviewBundle.layout_co}" />
- </tc:cell>
-
- <tx:in value="" label="#{overviewBundle.layout_street}" />
- <tx:in value="" label="#{overviewBundle.layout_streetNumber}" />
-
- <tx:in value="" label="#{overviewBundle.layout_zipCode}" />
- <tx:in value="" label="#{overviewBundle.layout_city}" />
-
- <tc:cell spanX="2">
- <tx:textarea value="" label="#{overviewBundle.layout_note}" />
- </tc:cell>
- </tc:box>
-<%-- code-sniplet-end id="layoutManagementExample" --%>
- </tc:panel>
- </jsp:body>
-</layout:overview>
+ <tx:selectOneChoice value="#{overviewController.singleValue}"
+ label="#{overviewBundle.layout_salutation}"
+ converter="salutationId">
+ <f:selectItems value="#{overviewController.items}"/>
+ </tx:selectOneChoice>
+ <tc:cell/>
+
+ <tx:in value="" label="#{overviewBundle.layout_firstName}"/>
+ <tx:in value="" label="#{overviewBundle.layout_lastName}"/>
+
+ <tc:cell spanX="2">
+ <tx:in value="" label="#{overviewBundle.layout_co}"/>
+ </tc:cell>
+
+ <tx:in value="" label="#{overviewBundle.layout_street}"/>
+ <tx:in value="" label="#{overviewBundle.layout_streetNumber}"/>
+
+ <tx:in value="" label="#{overviewBundle.layout_zipCode}"/>
+ <tx:in value="" label="#{overviewBundle.layout_city}"/>
+
+ <tc:cell spanX="2">
+ <tx:textarea value="" label="#{overviewBundle.layout_note}"/>
+ </tc:cell>
+ </tc:box>
+ <!-- code-sniplet-end id="layoutManagementExample" -->
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,47 +15,48 @@
* 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/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-
-<layout:overview>
- <jsp:body>
- <tc:panel>
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.locale}"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="80px;120px;1*"/>
+ </f:facet>
+
+ <tc:out escape="false" value="#{overviewBundle.locale_text}"/>
+
+ <tc:box label="#{overviewBundle.locale_title}" height="150px">
<f:facet name="layout">
- <tc:gridLayout rows="80px;120px;1*" />
+ <tc:gridLayout rows="fixed;1*"/>
</f:facet>
- <tc:out escape="false" value="#{overviewBundle.locale_text}" />
+ <tx:selectOneChoice value="#{clientConfigController2.locale}"
+ label="#{overviewBundle.locale}">
+ <f:selectItems value="#{clientConfigController2.localeItems}"/>
+ </tx:selectOneChoice>
- <tc:box label="#{overviewBundle.locale_title}" height="150px">
+ <tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;1*" />
+ <tc:gridLayout columns="100px;*;100px" rows="1*;fixed"/>
</f:facet>
-
- <tx:selectOneChoice value="#{clientConfigController2.locale}"
- label="#{overviewBundle.locale}">
- <f:selectItems value="#{clientConfigController2.localeItems}" />
- </tx:selectOneChoice>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="100px;*;100px" rows="1*;fixed"/>
- </f:facet>
- <tc:cell spanY="2" >
- <tc:image value="image/country.gif" width="100px" height="100px" />
- </tc:cell>
-
- <tc:cell spanY="2"/>
-
- <tc:cell/>
- <tc:button action="#{clientConfigController2.submit}" label="#{overviewBundle.locale_submit}" />
- </tc:panel>
-
- </tc:box>
- <tc:cell/>
- </tc:panel>
- </jsp:body>
-</layout:overview>
+ <tc:cell spanY="2">
+ <tc:image value="image/country.gif" width="100" height="100"/>
+ </tc:cell>
+
+ <tc:cell spanY="2"/>
+
+ <tc:cell/>
+ <tc:button action="#{clientConfigController2.submit}" label="#{overviewBundle.locale_submit}"/>
+ </tc:panel>
+
+ </tc:box>
+ <tc:cell/>
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/locale.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.xhtml (from r718955, myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.xhtml?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.xhtml&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp&r1=718955&r2=719606&rev=719606&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.xhtml Fri Nov 21 07:50:48 2008
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,139 +15,135 @@
* 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/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-<%@ page pageEncoding="UTF-8" %>
-<layout:overview>
- <jsp:body>
- <tc:box label="#{overviewBundle.sheet_sampleTitle}" id="sheetBox">
- <f:facet name="layout">
- <tc:gridLayout rows="2*;3*"/>
- </f:facet>
- <f:facet name="toolBar">
- <tc:toolBar>
- <tc:toolBarCommand label="#" tip="#{overviewBundle.sheet_configTip}">
- <tc:attribute name="renderedPartially" value="sheetConfigPopup"/>
- <f:facet name="popup">
- <tc:popup width="300" height="270" id="sheetConfigPopup">
- <tc:box label="#{overviewBundle.sheet_configTitle}">
+-->
+
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="#{overviewBundle.sheet}"/>
+ <tc:box label="#{overviewBundle.sheet_sampleTitle}" id="sheetBox">
+ <f:facet name="layout">
+ <tc:gridLayout rows="2*;3*"/>
+ </f:facet>
+ <f:facet name="toolBar">
+ <tc:toolBar>
+ <tc:toolBarCommand label="#" tip="#{overviewBundle.sheet_configTip}">
+ <tc:attribute name="renderedPartially" value="sheetConfigPopup"/>
+ <f:facet name="popup">
+ <tc:popup width="300" height="270" id="sheetConfigPopup">
+ <tc:box label="#{overviewBundle.sheet_configTitle}">
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;1*;fixed"/>
+ </f:facet>
+ <tx:selectOneChoice label="showHeader"
+ value="#{overviewController.sheetConfig.sheetShowHeader}"
+ tip="TODO: show Header Text">
+ <f:selectItem itemValue="#{true}" itemLabel="True"/>
+ <f:selectItem itemValue="#{false}" itemLabel="False"/>
+ </tx:selectOneChoice>
+ <tx:in label="first"
+ value="#{overviewController.sheetConfig.sheetFirst}"
+ tip="TODO: paging Start Text">
+ <f:validateLongRange minimum="0"/>
+ </tx:in>
+ <tx:in label="rows"
+ value="#{overviewController.sheetConfig.sheetRows}"
+ tip="TODO: paging Lenght Text">
+ <f:validateLongRange minimum="1"/>
+ </tx:in>
+
+ <tx:selectOneChoice label="showRowRange"
+ value="#{overviewController.sheetConfig.sheetRowPagingPosition}"
+ tip="TODO: paging DirectLinkCount Text">
+ <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
+ </tx:selectOneChoice>
+
+ <tx:selectOneChoice label="showPageRange"
+ value="#{overviewController.sheetConfig.sheetPagePagingPosition}"
+ tip="TODO: paging DirectLinkCount Text">
+ <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
+ </tx:selectOneChoice>
+
+ <tx:selectOneChoice label="showDirectLinks"
+ value="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
+ tip="TODO: paging DirectLinkCount Text">
+ <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
+ </tx:selectOneChoice>
+
+ <tx:selectOneChoice label="directLinkCount"
+ value="#{overviewController.sheetConfig.sheetDirectLinkCount}"
+ tip="TODO: paging DirectLinkCount Text">
+ <f:selectItems value="#{overviewController.sheetConfig.sheetDirectLinkCountItems}"/>
+ </tx:selectOneChoice>
+
+ <tx:selectOneChoice label="selectable"
+ value="#{overviewController.sheetConfig.selectable}"
+ tip="TODO: selectable Text">
+ <f:selectItems value="#{overviewController.sheetConfig.sheetSelectableItems}"/>
+ </tx:selectOneChoice>
+
+ <tc:cell/>
+
+ <tc:cell>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;1*;fixed"/>
+ <tc:gridLayout columns="100px;1*;100px"
+ marginLeft="10px" marginRight="10px"/>
</f:facet>
- <tx:selectOneChoice label="showHeader"
- value="#{overviewController.sheetConfig.sheetShowHeader}"
- tip="TODO: show Header Text">
- <f:selectItem itemValue="#{true}" itemLabel="True"/>
- <f:selectItem itemValue="#{false}" itemLabel="False"/>
- </tx:selectOneChoice>
- <tx:in label="first"
- value="#{overviewController.sheetConfig.sheetFirst}"
- tip="TODO: paging Start Text">
- <f:validateLongRange minimum="0"/>
- </tx:in>
- <tx:in label="rows"
- value="#{overviewController.sheetConfig.sheetRows}"
- tip="TODO: paging Lenght Text">
- <f:validateLongRange minimum="1"/>
- </tx:in>
-
- <tx:selectOneChoice label="showRowRange"
- value="#{overviewController.sheetConfig.sheetRowPagingPosition}"
- tip="TODO: paging DirectLinkCount Text">
- <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
- </tx:selectOneChoice>
-
- <tx:selectOneChoice label="showPageRange"
- value="#{overviewController.sheetConfig.sheetPagePagingPosition}"
- tip="TODO: paging DirectLinkCount Text">
- <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
- </tx:selectOneChoice>
-
- <tx:selectOneChoice label="showDirectLinks"
- value="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
- tip="TODO: paging DirectLinkCount Text">
- <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
- </tx:selectOneChoice>
-
- <tx:selectOneChoice label="directLinkCount"
- value="#{overviewController.sheetConfig.sheetDirectLinkCount}"
- tip="TODO: paging DirectLinkCount Text">
- <f:selectItems value="#{overviewController.sheetConfig.sheetDirectLinkCountItems}"/>
- </tx:selectOneChoice>
-
- <tx:selectOneChoice label="selectable"
- value="#{overviewController.sheetConfig.selectable}"
- tip="TODO: selectable Text">
- <f:selectItems value="#{overviewController.sheetConfig.sheetSelectableItems}"/>
- </tx:selectOneChoice>
-
+ <tc:button label="Cancel">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
<tc:cell/>
-
- <tc:cell>
- <f:facet name="layout">
- <tc:gridLayout columns="100px;1*;100px"
- marginLeft="10px" marginRight="10px"/>
- </f:facet>
- <tc:button label="Cancel">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
- <tc:cell/>
- <tc:button label="Ok">
- <tc:attribute name="popupClose" value="afterSubmit"/>
- <tc:attribute name="renderedPartially" value=":page:sheetBox"/>
- </tc:button>
- </tc:cell>
-
- </tc:box>
- </tc:popup>
- </f:facet>
- </tc:toolBarCommand>
- </tc:toolBar>
- </f:facet>
-
- <tc:out escape="false" value="#{overviewBundle.sheet_text}"/>
-
- <tc:sheet value="#{demo.solarList}" id="sheet"
- columns="3*;1*;3*;3*;3*;3*" var="luminary"
- state="#{demo.sheetState}"
- showHeader="#{overviewController.sheetConfig.sheetShowHeader}"
- showRowRange="#{overviewController.sheetConfig.sheetRowPagingPosition}"
- showPageRange="#{overviewController.sheetConfig.sheetPagePagingPosition}"
- showDirectLinks="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
- first="#{overviewController.sheetConfig.sheetFirst}"
- rows="#{overviewController.sheetConfig.sheetRows}"
- directLinkCount="#{overviewController.sheetConfig.sheetDirectLinkCount}"
- stateChangeListener="#{demo.stateChangeListener}"
- sortActionListener="#{overviewController.sheetSorter}"
- selectable="#{overviewController.sheetConfig.selectable}">
-<%--
- <f:facet name="reload">
- <tc:reload frequency="5000"/>
- </f:facet>
---%>
- <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
- <tc:out value="#{luminary.name}" id="t_name"/>
- </tc:column>
- <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false"
- tip="#{overviewBundle.solarArrayNumberTip}" align="center">
- <tc:out value="#{luminary.number}" id="t_number"/>
- </tc:column>
- <tc:column label="#{overviewBundle.solarArrayOrbit}" sortable="true" id="orbit">
- <tc:out value="#{luminary.orbit}" id="t_orbit"/>
- </tc:column>
- <tc:column label="#{overviewBundle.solarArrayPopulation}" sortable="true" id="population">
- <tc:in value="#{luminary.population}" id="t_population"/>
- </tc:column>
- <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right" id="distance">
- <tc:out value="#{luminary.distance}" id="t_distance"/>
- </tc:column>
- <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right" id="period">
- <tc:out value="#{luminary.period}" id="t_period"/>
- </tc:column>
- </tc:sheet>
- </tc:box>
- </jsp:body>
-</layout:overview>
+ <tc:button label="Ok">
+ <tc:attribute name="popupClose" value="afterSubmit"/>
+ <tc:attribute name="renderedPartially" value=":page:sheetBox"/>
+ </tc:button>
+ </tc:cell>
+
+ </tc:box>
+ </tc:popup>
+ </f:facet>
+ </tc:toolBarCommand>
+ </tc:toolBar>
+ </f:facet>
+
+ <tc:out escape="false" value="#{overviewBundle.sheet_text}"/>
+
+ <tc:sheet value="#{demo.solarList}" id="sheet"
+ columns="3*;1*;3*;3*;3*;3*" var="luminary"
+ state="#{demo.sheetState}"
+ showHeader="#{overviewController.sheetConfig.sheetShowHeader}"
+ showRowRange="#{overviewController.sheetConfig.sheetRowPagingPosition}"
+ showPageRange="#{overviewController.sheetConfig.sheetPagePagingPosition}"
+ showDirectLinks="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
+ first="#{overviewController.sheetConfig.sheetFirst}"
+ rows="#{overviewController.sheetConfig.sheetRows}"
+ directLinkCount="#{overviewController.sheetConfig.sheetDirectLinkCount}"
+ stateChangeListener="#{demo.stateChangeListener}"
+ sortActionListener="#{overviewController.sheetSorter}"
+ selectable="#{overviewController.sheetConfig.selectable}">
+ <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
+ <tc:out value="#{luminary.name}" id="t_name"/>
+ </tc:column>
+ <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false"
+ tip="#{overviewBundle.solarArrayNumberTip}" align="center">
+ <tc:out value="#{luminary.number}" id="t_number"/>
+ </tc:column>
+ <tc:column label="#{overviewBundle.solarArrayOrbit}" sortable="true" id="orbit">
+ <tc:out value="#{luminary.orbit}" id="t_orbit"/>
+ </tc:column>
+ <tc:column label="#{overviewBundle.solarArrayPopulation}" sortable="true" id="population">
+ <tc:in value="#{luminary.population}" id="t_population"/>
+ </tc:column>
+ <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right" id="distance">
+ <tc:out value="#{luminary.distance}" id="t_distance"/>
+ </tc:column>
+ <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right" id="period">
+ <tc:out value="#{luminary.period}" id="t_period"/>
+ </tc:column>
+ </tc:sheet>
+ </tc:box>
+</ui:composition>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.xhtml
------------------------------------------------------------------------------
svn:mergeinfo =