[richfaces-svn-commits] JBoss Rich Faces SVN: r11827 - in trunk/test-applications/realworld/web/src/main: java/org/richfaces/realworld/slideshow and 3 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Dec 16 12:07:43 EST 2008
Author: amarkhel
Date: 2008-12-16 12:07:43 -0500 (Tue, 16 Dec 2008)
New Revision: 11827
Modified:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/albumModalPanel.xhtml
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
Log:
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,6 +1,7 @@
package org.richfaces.realworld.session;
import java.io.IOException;
+import java.io.Serializable;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -30,7 +31,7 @@
@Name("authenticator")
@Scope(ScopeType.CONVERSATION)
-public class Authenticator
+public class Authenticator implements Serializable
{
@Logger Log log;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,5 +1,7 @@
package org.richfaces.realworld.slideshow;
+import java.io.Serializable;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -10,7 +12,7 @@
@Name("slideshow")
@Scope(ScopeType.CONVERSATION)
-public class SlideshowBean {
+public class SlideshowBean implements Serializable{
@In(required=false) @Out(required=false)
SlideshowHelper slideshowHelper;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -15,6 +15,8 @@
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.TransactionPropagationType;
+import org.jboss.seam.annotations.Transactional;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Comment;
import org.richfaces.realworld.domain.FriendshipRequest;
@@ -83,7 +85,7 @@
public void setSelectedAlbumName(String selectedAlbumName) {
this.selectedAlbumName = selectedAlbumName;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addAlbum(){
albumAction.addAlbum(album);
treeRoot.getAvailableAlbums().add(new SelectItem(album.getName()));
@@ -94,12 +96,12 @@
selectedAlbum = albumItem.getAlbum();
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public List<String> availableUserLogins(Object suggest){
List<String> suggestions = userAction.getUsers((String)suggest);
return suggestions;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void editAlbum(Album album){
boolean nameChanged = !album.getName().equals(album.getChangedName());
if(nameChanged){
@@ -118,7 +120,7 @@
treeRoot.updateChild(album);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void deleteAlbum(Album album){
String albumName = album.getName();
albumAction.deleteAlbum(album);
@@ -129,7 +131,7 @@
selectedAlbum = user.getChildAlbums().get(0);
selectedImage = selectedAlbum.getImages().get(0);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void deleteImage(Image image){
int index = image.getAlbum().getIndex(image);
String albumName = image.getAlbum().getName();
@@ -144,7 +146,7 @@
selectedImage = selectedAlbum.getImages().get(index-1);
}
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void editImage(Image image){
TreeAlbumItem parent = treeRoot.getAlbums().get(image.getAlbum().getId());
boolean parentChanged = !parent.getAlbum().getName().equals(image.getAlbumName());
@@ -165,17 +167,17 @@
imageItem.setImage(image);
}
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void resetImage(Image image){
image = imageAction.resetImage(image);
selectedImage = image;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void resetAlbum(Album album){
album = albumAction.resetAlbum(album);
selectedAlbum = album;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
@Observer("addImage")
public void addImage(Image image) {
imageAction.addImage(image);
@@ -185,15 +187,15 @@
selectedImage = imageItem.getImage();
selectedAlbum = albumItem.getAlbum();
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void editComment(Comment comment) {
imageAction.editComment(comment);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addComment(Comment comment) {
imageAction.addComment(comment);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addAutoComment(Image image) {
Comment comment = new Comment();
comment.setAuthor(user);
@@ -202,16 +204,16 @@
comment.setMessage("+1");
imageAction.addComment(comment);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void sendMessage(Message message) {
messageAction.sendMessage(message);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public Long getCountUnreadedMessages() {
Long count = userAction.countNotReadedMessages(user);
return count!= null? count:0;
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void removeFromFriends(User owner, User removed){
userAction.removeFromFriends(owner, removed);
Message message = new Message();
@@ -224,7 +226,7 @@
message.setTheme("You are were removed from friends");
messageAction.sendMessage(message);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addToFriends(User friend){
FriendshipRequest request = friend.getFriendshipRequest(user, friend);
if(request != null){
@@ -244,20 +246,20 @@
throw new Exception("This user won't be your friend!");
}*/
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void addToSharedAlbums(Image image){
userAction.addSharedAlbum(image.getAlbum());
}
- @Begin(join=true)
+ @Transactional(TransactionPropagationType.REQUIRED)
public void removeFromSharedAlbums(Album album){
userAction.removeFromSharedAlbums(user, album);
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void vote(Image image){
imageAction.vote(image, (Long)Long.valueOf(ratingHelper.getInputSlider().getValue().toString()));
}
-
+ @Transactional(TransactionPropagationType.REQUIRED)
public void showSharedAlbum(Image image){
NavigationEnum mainArea = NavigationEnum.IMAGE_PREVIEW;
treeSelectionManager.setMainArea(mainArea);
@@ -267,7 +269,7 @@
selectedImageIndex.setSelectedImageIndex(1);
}
- @Begin(join=true)
+ @Transactional(TransactionPropagationType.REQUIRED)
public void updateSelectedAlbum(){
selectedAlbum = user.getAlbumByName(this.getSelectedAlbumName());
selectedImage = selectedAlbum.getImages().get(0);
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -28,6 +28,8 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Synchronized;
+import org.jboss.seam.annotations.TransactionPropagationType;
+import org.jboss.seam.annotations.Transactional;
import org.richfaces.component.UIDatascroller;
import org.richfaces.component.UIDragSupport;
import org.richfaces.component.UITree;
@@ -47,7 +49,7 @@
@Name("treeSelectionManager")
@Scope(ScopeType.CONVERSATION)
- at Synchronized(timeout=2000)
+ at Synchronized(timeout=200000)
public class TreeSelectionManager implements Serializable{
@In(required=false)
@@ -61,13 +63,13 @@
@In(required=false) @Out(required=false)
private Album selectedAlbum;
- @In(create=true) @Out(required=false)
+ @In(required=false) @Out(required=false)
private SelectedImageIndex selectedImageIndex;
@In(create=true)
FileManager fileManager;
- @In(create=true)
+ @In(required=false)
TreeActionManager treeActionManager;
private String nodeTitle;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,21 +1,25 @@
package org.richfaces.realworld.util;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.TransactionPropagationType;
+import org.jboss.seam.annotations.Transactional;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.User;
@Name("friendHelper")
- at Scope(ScopeType.CONVERSATION)
-public class FriendHelper {
+ at Scope(ScopeType.SESSION)
+public class FriendHelper implements Serializable{
@Out(required=false)
private User selectedUser;
@@ -26,7 +30,7 @@
@In(required=false) @Out(required=false)
private Album selectedAlbum;
- @In(create=true) @Out(required=false)
+ @In(required=false) @Out(required=false)
private SelectedImageIndex selectedImageIndex;
private String albumName;
@@ -47,6 +51,7 @@
return albumNames;
}
+ @Transactional(TransactionPropagationType.REQUIRED)
@Begin(join=true)
public void chooseAlbum(User friend){
selectedUser = friend;
@@ -55,6 +60,7 @@
selectedImageIndex.setSelectedImageIndex(1);
}
+ @Transactional(TransactionPropagationType.REQUIRED)
@Begin(join=true)
public void chooseAlbum(Album album){
selectedUser = album.getOwner();
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -8,6 +8,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.Serializable;
import javax.imageio.ImageIO;
@@ -22,7 +23,7 @@
@Name("imageLoader")
@Scope(ScopeType.CONVERSATION)
-public class ImageLoader {
+public class ImageLoader implements Serializable{
@In(create=true)
FileManager fileManager;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/NavigationHelper.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,12 +1,14 @@
package org.richfaces.realworld.util;
+import java.io.Serializable;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@Name(value="navigationHelper")
@Scope(ScopeType.CONVERSATION)
-public class NavigationHelper {
+public class NavigationHelper implements Serializable{
private NavigationEnum navigationEnum;
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java 2008-12-16 16:36:32 UTC (rev 11826)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/SelectedImageIndex.java 2008-12-16 17:07:43 UTC (rev 11827)
@@ -1,12 +1,14 @@
package org.richfaces.realworld.util;
+import java.io.Serializable;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@Name("selectedImageIndex")
@Scope(ScopeType.CONVERSATION)
-public class SelectedImageIndex {
+public class SelectedImageIndex implements Serializable{
private Integer selectedImageIndex = 1;
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/albumModalPanel.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
===================================================================
(Binary files differ)
More information about the richfaces-svn-commits
mailing list