[richfaces-svn-commits] JBoss Rich Faces SVN: r11803 - in trunk/test-applications/realworld: ejb/src/main/java/org/richfaces/realworld/service and 8 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Tue Dec 16 07:30:50 EST 2008


Author: amarkhel
Date: 2008-12-16 07:30:50 -0500 (Tue, 16 Dec 2008)
New Revision: 11803

Added:
   trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileLoader.java
Modified:
   trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Message.java
   trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java
   trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
   trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java
   trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java
   trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
   trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/MessageAction.java
   trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
   trunk/test-applications/realworld/ejb/src/main/resources/import.sql
   trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.java
   trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.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/util/ModalPanelHelper.java
   trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml
   trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
   trunk/test-applications/realworld/web/src/main/webapp/fileUpload.xhtml
   trunk/test-applications/realworld/web/src/main/webapp/imagePreview.xhtml
   trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
   trunk/test-applications/realworld/web/src/main/webapp/readMessages.xhtml
   trunk/test-applications/realworld/web/src/main/webapp/register.xhtml
   trunk/test-applications/realworld/web/src/main/webapp/userPrefs.xhtml
Log:


Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Message.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Message.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Message.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -48,7 +48,7 @@
 	private String theme;
 	
 	@ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "AUTHOR_ID", nullable = false, updatable = false)
+    @JoinColumn(name = "AUTHOR_ID", updatable = false)
     @org.hibernate.annotations.ForeignKey(name = "FK_FROM_USERS_ID")
 	private User author;
 	

Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -93,9 +93,6 @@
 	private String password;
 	
 	@Transient
-	@NotNull
-    @NotEmpty
-    @Length(min=3)
 	private String confirmPassword;
 	
 	@ManyToMany(mappedBy = "sharedOwners")
@@ -112,7 +109,7 @@
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date birthDate;
 	
-	@OneToMany(mappedBy = "owner", cascade = { CascadeType.ALL }, fetch = FetchType.LAZY)
+	@OneToMany(mappedBy = "owner", cascade = { CascadeType.ALL}, fetch = FetchType.LAZY)
 	    @org.hibernate.annotations.LazyCollection(org.hibernate.annotations.LazyCollectionOption.EXTRA)
 	    @org.hibernate.annotations.OrderBy(clause = "NAME asc")
 	    private List<Album> childAlbums = new ArrayList<Album>();

Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -59,4 +59,9 @@
 	public void destroy(){
 		
 	}
+
+	public Album resetAlbum(Album album) {
+		em.refresh(album);
+		return album;
+	}
 }

Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -19,4 +19,6 @@
 	@Destroy
 	public abstract void destroy();
 
+	public abstract Album resetAlbum(Album album);
+
 }
\ No newline at end of file

Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -35,4 +35,6 @@
 
 	public abstract void vote(Image image, Long value);
 
+	public abstract Image resetImage(Image image);
+
 }
\ No newline at end of file

Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -66,6 +66,7 @@
 
 	public void addImage(Image image) {
 		em.persist(image);
+		image.getAlbum().addImage(image);
 		em.flush();
 	}
 	
@@ -94,4 +95,9 @@
 		image.getRank().setTotal(total);
 		em.flush();
 	}
+
+	public Image resetImage(Image image) {
+		em.refresh(image);
+		return image;
+	}
 }

Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/MessageAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/MessageAction.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/MessageAction.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -9,6 +9,8 @@
 import org.jboss.seam.annotations.Destroy;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.TransactionPropagationType;
+import org.jboss.seam.annotations.Transactional;
 import org.richfaces.realworld.domain.Comment;
 import org.richfaces.realworld.domain.Message;
 import org.richfaces.realworld.domain.User;
@@ -22,6 +24,7 @@
 	/* (non-Javadoc)
 	 * @see org.richfaces.realworld.service.IMessageAction#sendMessage(org.richfaces.realworld.domain.Message)
 	 */
+	@Transactional(TransactionPropagationType.REQUIRED)
 	public void sendMessage(Message message){
 		if(message.getOwnerLogin() != null){
 			User user = (User)em.createQuery("from User u where u.login = :login")
@@ -40,9 +43,10 @@
 	/* (non-Javadoc)
 	 * @see org.richfaces.realworld.service.IMessageAction#deleteMessage(org.richfaces.realworld.domain.Message)
 	 */
+	@Transactional(TransactionPropagationType.REQUIRED)
 	public void deleteMessage(Message message){
-		message = em.merge(message);
-		em.remove(message);
+		//message = em.merge(message);
+		//em.remove(message);
 		message.getOwner().removeMessage(message);
 		em.flush();
 	}

Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -57,7 +57,7 @@
 	}
 	
 	public void updateUser(User user) {
-		em.merge(user);
+		//em.merge(user);
 		em.flush();
 		this.user = user;
 	}

Modified: trunk/test-applications/realworld/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/resources/import.sql	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/ejb/src/main/resources/import.sql	2008-12-16 12:30:50 UTC (rev 11803)
@@ -1,7 +1,7 @@
 INSERT INTO Users(user_id, obj_version, firstname, secondname, email, avatarpath, login, password, birthdate) VALUES (1, 0, 'Andrey', 'Markhel', 'amarkhel at exadel.com', 'avatar.jpg', 'amarkhel', '12345',  '1985-01-08');
 INSERT INTO Users(user_id, obj_version, firstname, secondname, email, avatarpath, login, password, birthdate) VALUES (2, 0, 'Andrey', 'Markhel', 'amarkhel at exadel.com', 'avatar.jpg', 'root', '12345',  '1985-01-08');
 INSERT INTO Users(user_id, obj_version, firstname, secondname, email, avatarpath, login, password, birthdate) VALUES (3, 0, 'Andrey', 'Markhel', 'amarkhel at exadel.com', 'avatar.jpg', 'qqqq', '12345',  '1985-01-08');
-INSERT INTO albums(album_id, obj_version, name, description, shared, album_user_id) VALUES (1, 0, 'Album 1', 'Simple Album', true, 1);
+INSERT INTO albums(album_id, obj_version, name, description, shared, album_user_id) VALUES (1, 0, 'My dog', 'Photo of my dog', true, 1);
 INSERT INTO albums(album_id, obj_version, name, description, shared, album_user_id) VALUES (2, 0, 'Album 2', 'Simple Album 2', false, 1);
 INSERT INTO albums(album_id, obj_version, name, description, shared, album_user_id) VALUES (3, 0, 'Album 3', 'Simple Album 3', false, 1);
 INSERT INTO albums(album_id, obj_version, name, description, shared, album_user_id) VALUES (4, 0, 'Album 1', 'Simple Album', true, 2);
@@ -29,9 +29,9 @@
 INSERT INTO Ranks(rank_id, total, hits) VALUES (19, 110, 13);
 INSERT INTO Ranks(rank_id, total, hits) VALUES (20, 160, 21);
 INSERT INTO Ranks(rank_id, total, hits) VALUES (21, 100, 21);
-INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (1, 0, 'Picture 1', 'pic1.jpg', 'Just picture', true, '1985-01-08', 1, 1);
-INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (2, 0, 'Picture 2', 'pic2.jpg', 'Just picture', true, '1985-01-08', 1, 2);
-INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (3, 0, 'Picture 33', 'pic3.jpg', 'Just picture', true, '1985-01-08', 1, 3);
+INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (1, 0, 'Funny dog', 'cherri1.jpg', 'Funny dog', true, '1985-01-08', 1, 1);
+INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (2, 0, 'Beauty', 'cherri2.jpg', 'Beauty', true, '1985-01-08', 1, 2);
+INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (3, 0, 'Toy of my dog', 'cherri3.jpg', 'Toy of my dog', true, '1985-01-08', 1, 3);
 INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (4, 0, 'Picture 2', 'pic4.jpg', 'Just picture', true, '1985-01-08', 2, 4);
 INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (5, 0, 'Picture 3', 'pic5.jpg', 'Just picture', true, '1985-01-08', 2, 5);
 INSERT INTO images(image_id, obj_version, name, path, description, shared, created, img_album_id, rank_id) VALUES (6, 0, 'Picture 4', 'pic6.jpg', 'Just picture', true, '1985-01-08', 2, 6);

Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -20,7 +20,7 @@
 import org.richfaces.realworld.domain.User;
 
 @Name("avatarUpload")
- at Scope(ScopeType.CONVERSATION)
+ at Scope(ScopeType.SESSION)
 public class AvatarUpload implements Serializable{
 	
 	@In(create=true)

Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileLoader.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileLoader.java	                        (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileLoader.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -0,0 +1,21 @@
+package org.richfaces.realworld.fileupload;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+ at Name("fileLoader")
+ at Scope(ScopeType.SESSION)
+public class FileLoader {
+
+	@In FileUploadBean fileUploadBean;
+	@Begin(join=true)
+	public synchronized void paint(OutputStream stream, Object object) throws IOException {
+		stream.write(fileUploadBean.getFiles().get((Integer)object).getData());
+	}
+}


Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileLoader.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Id Revision Date
Name: svn:eol-style
   + native

Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -26,13 +26,17 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
+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.Synchronized;
+import org.jboss.seam.core.Events;
 import org.jboss.seam.faces.FacesMessages;
 import org.richfaces.event.UploadEvent;
 import org.richfaces.model.UploadItem;
@@ -41,33 +45,30 @@
 import org.richfaces.realworld.domain.User;
 import org.richfaces.realworld.tree.TreeActionManager;
 import org.richfaces.realworld.tree.TreeSelectionManager;
+import org.richfaces.realworld.util.NavigationEnum;
+import org.richfaces.realworld.util.SelectedImageIndex;
 
 /**
  * @author $Autor$
  *
  */
 @Name("fileUploadBean")
- at Scope(ScopeType.CONVERSATION)
- at Synchronized(timeout=2000)
+ at Scope(ScopeType.SESSION)
+ at Synchronized(timeout=5000)
 public class FileUploadBean implements Serializable{
 	
-	@In @Out
+	@In
 	private User user;
 	
-	@In(create=true) 
+	@In(required=false) 
 	private Image selectedImage;
 
-	@In(create=true) 
+	@In(required=false) 
 	private Album selectedAlbum;
-		 
-	@In(create=true) 
-	TreeActionManager treeActionManager;
 	
 	@In(create=true)
 	private FileManager fileManager;
 	
-	@In FacesMessages facesMessages;
-	
 	private ArrayList<FileItem> files = new ArrayList<FileItem>();
 	private boolean autoUpload = false;
 	public int getSize() {
@@ -79,10 +80,8 @@
 		}
 	}
 
-	public synchronized void paint(OutputStream stream, Object object) throws IOException {
-		stream.write(getFiles().get((Integer)object).getData());
-	}
 	
+	@Begin(join=true)
 	public synchronized void listener(UploadEvent event) throws Exception{
 	    UploadItem item = event.getUploadItem();
 	    FileItem file = new FileItem();
@@ -113,6 +112,7 @@
 	}
 	
 	public void storeSelectedData() {
+		List<FileItem> temp = new ArrayList<FileItem>();
 		for(FileItem file:files){
 			if(file.isSelected()){
 				//Save file to disk
@@ -123,9 +123,14 @@
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				treeActionManager.addImage(file.getImage());
+				Events.instance().raiseEvent("addImage", file.getImage());
+				//files.remove(file);
+			}else{
+				temp.add(file);
 			}
 		}
+		files.clear();
+		files.addAll(temp);
 	}
 	
 	public void storeAll() {
@@ -139,8 +144,10 @@
 				e.printStackTrace();
 			}
 			//Update domain model
-			treeActionManager.addImage(file.getImage());
+			Events.instance().raiseEvent("addImage", file.getImage());
+			//files.remove(file);
 		}
+		files.clear();
 	}
 	
 	public long getTimeStamp(){
@@ -162,6 +169,7 @@
 	public void setAutoUpload(boolean autoUpload) {
 		this.autoUpload = autoUpload;
 	}
+	
 }
 
 

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 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -9,8 +9,10 @@
 
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.End;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Observer;
 import org.jboss.seam.annotations.Out;
 import org.jboss.seam.annotations.Scope;
 import org.richfaces.realworld.domain.Album;
@@ -70,7 +72,7 @@
 	
 	@In(create=true) TreeSelectionManager treeSelectionManager;
 	
-	@In(create=true) TreeRootItem treeRoot;
+	@In(create=true) @Out TreeRootItem treeRoot;
 	
 	private String selectedAlbumName;
 	
@@ -124,18 +126,23 @@
 		treeRoot.getAvailableAlbums().remove(item);
 		treeRoot.removeChild(album.getId());
 		fileManager.deleteDirectory(user.getLogin() + fileManager.getFileSeparator() + albumName);
-		selectedImage = null;
-		selectedAlbum = null;
+		selectedAlbum = user.getChildAlbums().get(0);
+		selectedImage = selectedAlbum.getImages().get(0);
 	}
 	
 	public void deleteImage(Image image){
+		int index = image.getAlbum().getIndex(image);
 		String albumName = image.getAlbum().getName();
 		String imagePath = image.getPath();
 		TreeAlbumItem parent = treeRoot.getAlbums().get(image.getAlbum().getId());
 		imageAction.deleteImage(image);
 		parent.removeChild(image.getId());
 		fileManager.deleteImage(user.getLogin() + fileManager.getFileSeparator() + albumName + fileManager.getFileSeparator() + imagePath);
-		selectedImage = null;
+		if(selectedAlbum.getImages().size() > index){
+			selectedImage = selectedAlbum.getImages().get(index);
+		}else{
+			selectedImage = selectedAlbum.getImages().get(index-1);
+		}
 	}
 	
 	public void editImage(Image image){
@@ -158,7 +165,18 @@
 			imageItem.setImage(image);
 		}	
 	}
+	
+	public void resetImage(Image image){
+		image = imageAction.resetImage(image);	
+		selectedImage = image;
+	}
+	
+	public void resetAlbum(Album album){
+		album = albumAction.resetAlbum(album);	
+		selectedAlbum = album;
+	}
 
+	@Observer("addImage")
 	public void addImage(Image image) {
 		imageAction.addImage(image);
 		TreeAlbumItem albumItem = treeRoot.getAlbumByName(image.getAlbumName());

Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java	2008-12-16 12:30:50 UTC (rev 11803)
@@ -6,6 +6,8 @@
 import javax.faces.event.ActionEvent;
 
 import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.End;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Out;
@@ -94,7 +96,7 @@
 		this.searchRequired = false;
 	}
 	
-	public void initModalPanelData( String actionName, boolean sendRequired, Message message, boolean userSearchRequired){
+	public void initMessage( String actionName, boolean sendRequired, Message message, boolean userSearchRequired){
 		this.actionName = actionName;
 		this.sendRequired = sendRequired;
 		this.searchRequired = userSearchRequired;

Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml	2008-12-16 11:50:16 UTC (rev 11802)
+++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml	2008-12-16 12:30:50 UTC (rev 11803)
@@ -20,7 +20,7 @@
 
    <core:init debug="true" jndi-pattern="@jndiPattern@"/>
      
-   <core:manager concurrent-request-timeout="500" 
+   <core:manager concurrent-request-timeout="2000" 
                  conversation-timeout="120000" 
                  conversation-id-parameter="cid"/>
                  <persistence:managed-persistence-context name="entityManager" 

Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
===================================================================
(Binary files differ)

Modified: trunk/test-applications/realworld/web/src/main/webapp/fileUpload.xhtml
===================================================================
(Binary files differ)

Modified: trunk/test-applications/realworld/web/src/main/webapp/imagePreview.xhtml
===================================================================
(Binary files differ)

Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)

Modified: trunk/test-applications/realworld/web/src/main/webapp/readMessages.xhtml
===================================================================
(Binary files differ)

Modified: trunk/test-applications/realworld/web/src/main/webapp/register.xhtml
===================================================================
(Binary files differ)

Modified: trunk/test-applications/realworld/web/src/main/webapp/userPrefs.xhtml
===================================================================
(Binary files differ)




More information about the richfaces-svn-commits mailing list