[richfaces-svn-commits] JBoss Rich Faces SVN: r12558 - in trunk/test-applications/realworld: web/src/main/java/org/richfaces/realworld/fileupload and 3 other directories.

Author: amarkhel Date: 2009-02-04 07:39:38 -0500 (Wed, 04 Feb 2009) New Revision: 12558 Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml Log: Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java =================================================================== --- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-02-04 12:12:42 UTC (rev 12557) +++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-02-04 12:39:38 UTC (rev 12558) @@ -80,7 +80,7 @@ @Column(length = 1024) private String description; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "ALBUM_USER_ID", referencedColumnName = "USER_ID") private User owner; Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java 2009-02-04 12:12:42 UTC (rev 12557) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java 2009-02-04 12:39:38 UTC (rev 12558) @@ -99,7 +99,7 @@ if (null == data) { return; } - File imageResource = fileManager.getImage(fileManager.transformToServerPath(data.toString())); + File imageResource = fileManager.getImage(data.toString()); if (imageResource != null) { FileInputStream fileInputStream = new FileInputStream(imageResource); BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream); Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-02-04 12:12:42 UTC (rev 12557) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-02-04 12:39:38 UTC (rev 12558) @@ -32,7 +32,7 @@ import org.richfaces.realworld.util.ConversationState; @Name("albumManager") -(a)Scope(ScopeType.SESSION) +(a)Scope(ScopeType.PAGE) public class AlbumManager { @In @Out Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java =================================================================== --- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-02-04 12:12:42 UTC (rev 12557) +++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-02-04 12:39:38 UTC (rev 12558) @@ -37,7 +37,7 @@ import org.richfaces.realworld.service.Constants; @Name("conversationState") -(a)Scope(ScopeType.SESSION) +(a)Scope(ScopeType.PAGE) public class ConversationState implements Serializable{ private static final long serialVersionUID = 5656562187249324512L; Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml 2009-02-04 12:12:42 UTC (rev 12557) +++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml 2009-02-04 12:39:38 UTC (rev 12558) @@ -8,6 +8,9 @@ <rule if-outcome="register"> <redirect view-id="/register.xhtml"/> </rule> + <rule if-outcome="index"> + <redirect view-id="/index.html"/> + </rule> </navigation> </page>