[richfaces-svn-commits] JBoss Rich Faces SVN: r14067 - in trunk/examples/photoalbum/source/web/src/main: webapp/WEB-INF and 4 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: amarkhel
Date: 2009-05-07 10:48:29 -0400 (Thu, 07 May 2009)
New Revision: 14067

Modified:
   trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
   trunk/examples/photoalbum/source/web/src/main/webapp/WEB-INF/pages.xml
   trunk/examples/photoalbum/source/web/src/main/webapp/includes/album/albumInfo.xhtml
   trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageInfo.xhtml
   trunk/examples/photoalbum/source/web/src/main/webapp/includes/misc/errorPanel.xhtml
   trunk/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelfInfo.xhtml
   trunk/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelvesList.xhtml
Log:


Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java	2009-05-07 14:48:18 UTC (rev 14066)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java	2009-05-07 14:48:29 UTC (rev 14067)
@@ -73,13 +73,6 @@
 
 	private boolean conversationStarted = false;
 
-	public boolean needStartConversation() {
-		if (identity.isLoggedIn()) {
-			setConversationStarted(true);
-		}
-		return user.getId() == null && !isConversationStarted();
-	}
-
 	public boolean authenticate() {
 		try {
 			user = userAction.login(credentials.getUsername(), HashUtils
@@ -147,7 +140,7 @@
 	}
 
 	public void goToRegister() {
-		Contexts.getSessionContext().set("user", new User());
+		user = new User();
 		Contexts.getConversationContext().set(Constants.AVATAR_DATA_COMPONENT,
 				null);
 		setLoginFailed(false);

Modified: trunk/examples/photoalbum/source/web/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/webapp/WEB-INF/pages.xml	2009-05-07 14:48:18 UTC (rev 14066)
+++ trunk/examples/photoalbum/source/web/src/main/webapp/WEB-INF/pages.xml	2009-05-07 14:48:29 UTC (rev 14067)
@@ -4,8 +4,8 @@
        xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
    
    <page view-id="/index.xhtml">
-   <begin-conversation if="#{!conversation.longRunning and authenticator.needStartConversation()}"/>
-   <action if="#{user.id == null and !authenticator.conversationStarted}" execute="#{authenticator.startConversation}"/>
+   <begin-conversation if="#{!conversation.longRunning}"/>
+   <action on-postback="false" if="#{!authenticator.conversationStarted}" execute="#{authenticator.startConversation}"/>
  		<navigation from-action="#{authenticator.logout}">
  			<rule if-outcome="logout">
  				<end-conversation />

Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/album/albumInfo.xhtml
===================================================================
(Binary files differ)

Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)

Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/misc/errorPanel.xhtml
===================================================================
(Binary files differ)

Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelfInfo.xhtml
===================================================================
(Binary files differ)

Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/shelf/shelvesList.xhtml
===================================================================
(Binary files differ)