You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/02/26 05:39:04 UTC
svn commit: r1074791 - in /myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src: main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/ main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/config/ main/java...

Author: gpetracek
Date: Sat Feb 26 04:39:02 2011
New Revision: 1074791

URL: http://svn.apache.org/viewvc?rev=1074791&view=rev
Log:
changed example

Added:
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simpleRegistration/
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simpleRegistration/SimpleRegistrationPage.java
      - copied, changed from r1074783, myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simple/SimpleRegistrationPage.java
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/pages/simpleRegistration/
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/pages/simpleRegistration/form.xhtml
      - copied unchanged from r1074783, myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/pages/simple/form.xhtml
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/pages/simpleRegistration/summary.xhtml
      - copied unchanged from r1074783, myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/pages/simple/summary.xhtml
Removed:
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simple/SimpleRegistrationPage.java
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/pages/simple/form.xhtml
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/webapp/pages/simple/summary.xhtml
Modified:
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/MenuBean.java
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/config/Pages.java
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/test/java/org/apache/myfaces/extensions/cdi/example/test/SimpleTestCase.java

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/MenuBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/MenuBean.java?rev=1074791&r1=1074790&r2=1074791&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/MenuBean.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/MenuBean.java Sat Feb 26 04:39:02 2011
@@ -35,6 +35,6 @@ public class MenuBean
     {
         //close all conversations of the current window
         this.windowContext.closeConversations();
-        return Pages.Simple.Form.class;
+        return Pages.SimpleRegistration.Form.class;
     }
 }

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/config/Pages.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/config/Pages.java?rev=1074791&r1=1074790&r2=1074791&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/config/Pages.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/config/Pages.java Sat Feb 26 04:39:02 2011
@@ -26,13 +26,13 @@ import static org.apache.myfaces.extensi
 @Page(navigation = REDIRECT)
 public interface Pages extends ViewConfig
 {
-    public interface Simple extends Pages
+    public interface SimpleRegistration extends Pages
     {
-        public @Page class Form implements Simple
+        public @Page class Form implements SimpleRegistration
         {
         }
 
-        public @Page class Summary implements Simple
+        public @Page class Summary implements SimpleRegistration
         {
         }
     }

Copied: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simpleRegistration/SimpleRegistrationPage.java (from r1074783, myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simple/SimpleRegistrationPage.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simpleRegistration/SimpleRegistrationPage.java?p2=myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simpleRegistration/SimpleRegistrationPage.java&p1=myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simple/SimpleRegistrationPage.java&r1=1074783&r2=1074791&rev=1074791&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simple/SimpleRegistrationPage.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/main/java/org/apache/myfaces/extensions/cdi/example/jsf20/view/simpleRegistration/SimpleRegistrationPage.java Sat Feb 26 04:39:02 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.example.jsf20.view.simple;
+package org.apache.myfaces.extensions.cdi.example.jsf20.view.simpleRegistration;
 
 import org.apache.myfaces.extensions.cdi.example.jsf20.domain.User;
 import org.apache.myfaces.extensions.cdi.example.jsf20.view.config.Pages;
@@ -54,11 +54,11 @@ public class SimpleRegistrationPage impl
                 .argument(this.user.getLoginName())
                 .add();
         
-        return Pages.Simple.Summary.class;
+        return Pages.SimpleRegistration.Summary.class;
     }
 
     @CloseConversationGroup
-    public Class<? extends Pages.Simple> registerUserAndRestart()
+    public Class<? extends Pages.SimpleRegistration> registerUserAndRestart()
     {
         registerUser();
         return null; //stay on the same page

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/test/java/org/apache/myfaces/extensions/cdi/example/test/SimpleTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/test/java/org/apache/myfaces/extensions/cdi/example/test/SimpleTestCase.java?rev=1074791&r1=1074790&r2=1074791&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/test/java/org/apache/myfaces/extensions/cdi/example/test/SimpleTestCase.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/src/test/java/org/apache/myfaces/extensions/cdi/example/test/SimpleTestCase.java Sat Feb 26 04:39:02 2011
@@ -33,26 +33,26 @@ public class SimpleTestCase extends Base
     public void testSimpleRegistration() throws Exception
     {
         SimplePageInteraction pageInteraction = new SimplePageInteraction(getTestConfiguration())
-                .with(Pages.Simple.Form.class)
-                .with(Pages.Simple.Summary.class);
+                .with(Pages.SimpleRegistration.Form.class)
+                .with(Pages.SimpleRegistration.Summary.class);
 
         pageInteraction
-                .start(Pages.Simple.Form.class)
+                .start(Pages.SimpleRegistration.Form.class)
                 .useForm("mainForm");
 
         //prependId="false"
         pageInteraction.setValue("loginName", "codi");
         pageInteraction
                 .click("register")
-                .checkState(Pages.Simple.Summary.class);
+                .checkState(Pages.SimpleRegistration.Summary.class);
 
         pageInteraction.checkTextValue("loginName", "codi");
 
         //close conversation
         pageInteraction
                 .clickOk()
-                .checkState(Pages.Simple.Form.class);
+                .checkState(Pages.SimpleRegistration.Form.class);
 
         pageInteraction.checkTextValue("loginName", "");
     }
-}
\ No newline at end of file
+}