You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/08/07 14:36:57 UTC

svn commit: r563477 - in /myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp: WEB-INF/faces-config.xml WEB-INF/web.xml index.html index.jspx page1.jspx

Author: matzew
Date: Tue Aug  7 05:36:56 2007
New Revision: 563477

URL: http://svn.apache.org/viewvc?view=rev&rev=563477
Log:
small improvement for the blank demo, that http://host:PORT/CONTEXT works

Added:
    myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/index.html
    myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/page1.jspx
Removed:
    myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/index.jspx
Modified:
    myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/web.xml

Modified: myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=563477&r1=563476&r2=563477
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/faces-config.xml Tue Aug  7 05:36:56 2007
@@ -43,7 +43,7 @@
 
   <!-- navigation rules for index.jspx -->
   <navigation-rule>
-    <from-view-id>/index.jspx</from-view-id>
+    <from-view-id>/page1.jspx</from-view-id>
     <navigation-case>
       <from-outcome>success</from-outcome>
       <to-view-id>/page2.jspx</to-view-id>
@@ -55,7 +55,7 @@
     <from-view-id>/page2.jspx</from-view-id>
     <navigation-case>
       <from-outcome>back</from-outcome>
-      <to-view-id>/index.jspx</to-view-id>
+      <to-view-id>/page1.jspx</to-view-id>
     </navigation-case>
   </navigation-rule>
 

Modified: myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/web.xml?view=diff&rev=563477&r1=563476&r2=563477
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/WEB-INF/web.xml Tue Aug  7 05:36:56 2007
@@ -112,7 +112,7 @@
 
   <!-- Welcome Files -->
   <welcome-file-list>
-    <welcome-file>index.jspx</welcome-file>
+    <welcome-file>index.html</welcome-file>
   </welcome-file-list>
 
 </web-app>

Added: myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/index.html?view=auto&rev=563477
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/index.html (added)
+++ myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/index.html Tue Aug  7 05:36:56 2007
@@ -0,0 +1,6 @@
+<html>
+
+<head>
+<meta http-equiv="refresh" content="0; URL=faces/page1.jspx">
+</head>
+</html>
\ No newline at end of file

Added: myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/page1.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/page1.jspx?view=auto&rev=563477
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/page1.jspx (added)
+++ myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-blank/src/main/webapp/page1.jspx Tue Aug  7 05:36:56 2007
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+    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 xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+          xmlns:f="http://java.sun.com/jsf/core"
+          xmlns:tr="http://myfaces.apache.org/trinidad" >
+  <jsp:directive.page contentType="text/html;charset=utf-8"/>
+  <f:view>
+    <tr:document title="Apache Trinidad Blank Demo">
+       <tr:form>
+       
+        <tr:panelPage>
+          <tr:inputText label="Your name" id="input1" value="#{helloWorldBacking.name}" required="true"/>
+          <tr:commandButton id="button1" text="press me" action="#{helloWorldBacking.send}" />
+        </tr:panelPage>
+       
+       </tr:form>
+    </tr:document>
+  </f:view>
+</jsp:root>
\ No newline at end of file