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/10/17 11:48:28 UTC
svn commit: r705537 - in
/myfaces/tobago/branches/tobago-1.0.x/example/sandbox: ./
src/main/java/org/apache/myfaces/tobago/example/sandbox/ src/main/webapp/
src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF/tags/layout/
src/main/webapp/wizard/
Author: lofwyr
Date: Fri Oct 17 02:48:27 2008
New Revision: 705537
URL: http://svn.apache.org/viewvc?rev=705537&view=rev
Log:
TOBAGO-518: Wizard: Backporting Wizard from trunk to 1.0.x
Removed:
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/snip-0.xml
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/snip-1.xml
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/wizard/
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/wizard.xml
Modified:
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/pom.xml
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/tags/layout/wizard.tag
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/navigation.jsp
Modified: myfaces/tobago/branches/tobago-1.0.x/example/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/sandbox/pom.xml?rev=705537&r1=705536&r2=705537&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/sandbox/pom.xml Fri Oct 17 02:48:27 2008
@@ -15,237 +15,245 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-example</artifactId>
- <version>1.0.20-SNAPSHOT</version>
- </parent>
- <artifactId>tobago-example-sandbox</artifactId>
- <packaging>war</packaging>
- <name>Example Sandbox</name>
- <build>
- <finalName>tobago-example-sandbox</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
- </plugin>
- <plugin>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>maven-apt-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>tobago-facelet-sandbox-taglib</id>
- <goals><goal>execute</goal></goals>
- <phase>validate</phase>
- <configuration>
- <excludes>
- <exclude>org/apache/myfaces/tobago/*</exclude>
- </excludes>
- <includes>
- <include>org/apache/myfaces/tobago/taglib/component/*</include>
- <include>org/apache/myfaces/tobago/taglib/decl/*</include>
- </includes>
- <aptSourceRoots>
- <aptSourceRoot>${project.build.directory}/tobago-core-sources</aptSourceRoot>
- </aptSourceRoots>
- <targetFiles>
- <targetFile>tobago-sandbox.taglib.xml</targetFile>
- </targetFiles>
- <resourceTargetPath>META-INF</resourceTargetPath>
- <generated>target/generated-sources</generated>
- <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>
- <nocompile>true</nocompile>
- <encoding>UTF-8</encoding>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <artifactId>tobago-example</artifactId>
+ <version>1.0.20-SNAPSHOT</version>
+ </parent>
+ <artifactId>tobago-example-sandbox</artifactId>
+ <packaging>war</packaging>
+ <name>Example Sandbox</name>
+ <build>
+ <finalName>tobago-example-sandbox</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <configuration>
+ <server>tomcat</server>
+ <update>true</update>
+ <url>http://localhost:8080/manager</url>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>tobago-facelet-sandbox-taglib</id>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <excludes>
+ <exclude>org/apache/myfaces/tobago/*</exclude>
+ </excludes>
+ <includes>
+ <include>org/apache/myfaces/tobago/taglib/component/*</include>
+ <include>org/apache/myfaces/tobago/taglib/decl/*</include>
+ </includes>
+ <aptSourceRoots>
+ <aptSourceRoot>${project.build.directory}/tobago-core-sources</aptSourceRoot>
+ </aptSourceRoots>
+ <targetFiles>
+ <targetFile>tobago-sandbox.taglib.xml</targetFile>
+ </targetFiles>
+ <resourceTargetPath>META-INF</resourceTargetPath>
+ <generated>target/generated-sources</generated>
+ <factory>org.apache.myfaces.tobago.apt.FaceletAnnotationProcessorFactory</factory>
+ <nocompile>true</nocompile>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.19</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.19</developerConnection>
- <url>http://svn.apache.org/viewvc/myfaces/tobago/tags/tobago-1.0.19</url>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-scarborough</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-speyside</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-standard</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-core</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-sandbox</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.11</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!--<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>-->
- <dependency>
- <groupId>com.sun.el</groupId>
- <artifactId>el-ri</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
- <!-- for running with jetty exclude el-api -->
-<!-- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-facelets</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency> -->
- </dependencies>
- <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>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.19</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-1.0.19
+ </developerConnection>
+ <url>http://svn.apache.org/viewvc/myfaces/tobago/tags/tobago-1.0.19</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-theme-scarborough</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-theme-speyside</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-theme-richmond</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-theme-standard</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-core</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-sandbox</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.11</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <scope>runtime</scope>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
</dependency>
- </dependencies>
- </profile>
- </profiles>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>-->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <!-- in the case of Servlet 2.5 / JSP 2.1
+ e. g. Tomcat 6 the scope should be "provided"
+ -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+ <!-- for running with jetty exclude el-api -->
+ <!-- <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-facelets</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency> -->
+ </dependencies>
+ <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>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java?rev=705537&r1=705536&r2=705537&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java Fri Oct 17 02:48:27 2008
@@ -21,7 +21,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.model.TreeState;
import org.apache.myfaces.tobago.model.Wizard;
-import org.apache.myfaces.tobago.model.WizardImpl;
import javax.swing.tree.DefaultMutableTreeNode;
import java.text.SimpleDateFormat;
@@ -42,6 +41,7 @@
private Wizard wizard;
private String filterType;
+ private String filterValue;
public Controller() {
// tree
@@ -81,7 +81,7 @@
// wizard
- wizard = new WizardImpl();
+ wizard = new Wizard();
}
public String action1() {
@@ -100,12 +100,13 @@
}
public String createFilter() {
+ LOG.info("Filter type: '" + filterType + "'");
if ("fileInto".equals(filterType)) {
return "fileIntoCondition";
} else if ("forward".equals(filterType)) {
return "forwardCondition";
}
- throw new RuntimeException("no filter");
+ throw new RuntimeException("No filter type set.");
}
public String createNode() {
@@ -173,4 +174,12 @@
public void setFilterType(String filterType) {
this.filterType = filterType;
}
+
+ public String getFilterValue() {
+ return filterValue;
+ }
+
+ public void setFilterValue(String filterValue) {
+ this.filterValue = filterValue;
+ }
}
Modified: myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml?rev=705537&r1=705536&r2=705537&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml Fri Oct 17 02:48:27 2008
@@ -39,93 +39,58 @@
</managed-bean>
<navigation-rule>
- <from-view-id>/wizard/bean/single.jsp</from-view-id>
<navigation-case>
- <from-outcome>wizard</from-outcome>
- <to-view-id>/wizard/bean/single.jsp</to-view-id>
+ <from-outcome>index</from-outcome>
+ <to-view-id>/jsp/wizard/index.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/wizard.xml</from-view-id>
+ <from-view-id>/jsp/wizard/bean/single.jsp</from-view-id>
<navigation-case>
<from-outcome>wizard</from-outcome>
- <to-view-id>/wizard.xml</to-view-id>
+ <to-view-id>/jsp/wizard/bean/single.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/wizard/navi/*</from-view-id>
- <navigation-case>
- <from-outcome>fileIntoCondition</from-outcome>
- <to-view-id>/wizard/navi/fileIntoCondition.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>forwardCondition</from-outcome>
- <to-view-id>/wizard/navi/forwardCondition.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>finish</from-outcome>
- <to-view-id>/wizard/navi/finish.jsp</to-view-id>
- </navigation-case>
+ <from-view-id>/jsp/wizard/navi/*</from-view-id>
<navigation-case>
<from-outcome>filter</from-outcome>
- <to-view-id>/wizard/navi/filter.jsp</to-view-id>
+ <to-view-id>/jsp/wizard/navi/filter.jsp</to-view-id>
</navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/wizard/navi/filter.jsp</from-view-id>
<navigation-case>
<from-outcome>fileIntoCondition</from-outcome>
- <to-view-id>/wizard/navi/fileIntoCondition.jsp</to-view-id>
+ <to-view-id>/jsp/wizard/navi/fileIntoCondition.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>forwardCondition</from-outcome>
- <to-view-id>/wizard/navi/forwardCondition.jsp</to-view-id>
+ <to-view-id>/jsp/wizard/navi/forwardCondition.jsp</to-view-id>
</navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/wizard/navi/fileIntoCondition.jsp</from-view-id>
<navigation-case>
- <from-outcome>next</from-outcome>
- <to-view-id>/wizard/navi/finish.jsp</to-view-id>
- </navigation-case>
-<!--
- <navigation-case>
- <from-outcome>previous</from-outcome>
- <to-view-id>/wizard/navi/filter.jsp</to-view-id>
+ <from-outcome>finish</from-outcome>
+ <to-view-id>/jsp/wizard/navi/finish.jsp</to-view-id>
</navigation-case>
--->
</navigation-rule>
<navigation-rule>
- <from-view-id>/wizard/navi/forwardCondition.jsp</from-view-id>
+ <from-view-id>/facelet/wizard/navi/*</from-view-id>
<navigation-case>
- <from-outcome>next</from-outcome>
- <to-view-id>/wizard/navi/finish.jsp</to-view-id>
+ <from-outcome>filter</from-outcome>
+ <to-view-id>/facelet/wizard/navi/filter.xml</to-view-id>
</navigation-case>
-<!--
<navigation-case>
- <from-outcome>previous</from-outcome>
- <to-view-id>/wizard/navi/filter.jsp</to-view-id>
+ <from-outcome>fileIntoCondition</from-outcome>
+ <to-view-id>/facelet/wizard/navi/fileIntoCondition.xml</to-view-id>
</navigation-case>
--->
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/wizard/navi/finish.jsp</from-view-id>
-<!--
<navigation-case>
<from-outcome>forwardCondition</from-outcome>
- <to-view-id>/wizard/navi/fileIntoCondition.jsp</to-view-id>
+ <to-view-id>/facelet/wizard/navi/forwardCondition.xml</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>forwardCondition</from-outcome>
- <to-view-id>/wizard/navi/forwardCondition.jsp</to-view-id>
+ <from-outcome>finish</from-outcome>
+ <to-view-id>/facelet/wizard/navi/finish.xml</to-view-id>
</navigation-case>
--->
</navigation-rule>
</faces-config>
Modified: myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/tags/layout/wizard.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/tags/layout/wizard.tag?rev=705537&r1=705536&r2=705537&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/tags/layout/wizard.tag (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/tags/layout/wizard.tag Fri Oct 17 02:48:27 2008
@@ -24,7 +24,7 @@
<tc:page label="Sandbox - Wizard" id="page" width="500px" height="300px">
<f:facet name="layout">
- <tc:gridLayout margin="10px" rows="fixed;*"/>
+ <tc:gridLayout margin="10px" rows="20px;*"/> <!-- 20px shoud be replaced with fixed -->
</f:facet>
<tc:messages/>
Modified: myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/web.xml?rev=705537&r1=705536&r2=705537&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/WEB-INF/web.xml Fri Oct 17 02:48:27 2008
@@ -94,4 +94,11 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
+ <jsp-config>
+ <jsp-property-group>
+ <url-pattern>*.jsp</url-pattern>
+ <page-encoding>UTF-8</page-encoding>
+ </jsp-property-group>
+ </jsp-config>
+
</web-app>
Modified: myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/navigation.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/navigation.jsp?rev=705537&r1=705536&r2=705537&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/navigation.jsp (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/sandbox/src/main/webapp/navigation.jsp Fri Oct 17 02:48:27 2008
@@ -28,23 +28,9 @@
<tc:link link="separator.jsp" label="separator.jsp" target="View"/>
- <tc:link link="tree-normal.jsp" label="tree-normal.jsp" target="View"/>
-
- <tc:link link="tree-select.jsp" label="tree-select.jsp" target="View"/>
-
- <tc:link link="tree-menu.jsp" label="tree-menu.jsp" target="View"/>
-
- <tc:link link="tree-editor.jsp" label="tree-editor.jsp" target="View"/>
-
- <tc:link link="tree-ajax.jsp" label="tree-ajax.jsp" target="View"/>
-
<tc:link link="inputSlider.jsp" label="inputSlider.jsp" target="View"/>
- <tc:link link="wizard/bean/single.jsp" label="Wizard with navigation from model" target="View"/>
-
- <tc:link link="wizard/navi/filter.jsp" label="Wizard with navigation tree" target="View"/>
-
- <tc:link link="wizard.xml" label="wizard.xml" target="View"/>
+ <tc:link link="jsp/wizard/index.jsp" label="Wizard" target="View"/>
<tc:cell/>
</tc:page>