[richfaces-svn-commits] JBoss Rich Faces SVN: r11867 - in trunk/test-applications/realworld: ejb/src/main/java/org/richfaces/realworld/domain and 8 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Dec 18 07:09:09 EST 2008
Author: amarkhel
Date: 2008-12-18 07:09:08 -0500 (Thu, 18 Dec 2008)
New Revision: 11867
Added:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileWrapper.java
Removed:
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/dao/
Modified:
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java
trunk/test-applications/realworld/ejb/src/main/resources/META-INF/persistence.xml
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/FileLoader.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.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/session/Authenticator.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/ComboboxHelper.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/webapp/WEB-INF/components.xml
trunk/test-applications/realworld/web/src/main/webapp/fileUpload.xhtml
trunk/test-applications/realworld/web/src/main/webapp/index.xhtml
trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld/web/src/main/webapp/navigation.xhtml
Log:
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java 2008-12-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -48,7 +48,7 @@
@Column(length = 1024, nullable = false)
@NotNull
@NotEmpty
- @Length(min=3)
+ @Length(min=2)
private String message;
public Long getId() {
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-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -41,7 +41,7 @@
})*/
@Entity
- at Scope(ScopeType.SESSION)
+ at Scope(ScopeType.CONVERSATION)
@Name("user")
@Role(name="selectedUser", scope = ScopeType.CONVERSATION)
@Table(name = "Users")
Modified: trunk/test-applications/realworld/ejb/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/resources/META-INF/persistence.xml 2008-12-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/ejb/src/main/resources/META-INF/persistence.xml 2008-12-18 12:09:08 UTC (rev 11867)
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
- <persistence-unit name="entityManager">
+ <persistence-unit name="entityManager" transaction-type="JTA">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>java:/realWorldDatasource</jta-data-source>
<properties>
@@ -15,6 +15,7 @@
<property name="hibernate.format_sql" value="true"/>
<property name="jboss.entity.manager.factory.jndi.name"
value="java:/realWorldEntityManager"/>
+ <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
</properties>
<!--<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
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-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/AvatarUpload.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -20,7 +20,7 @@
import org.richfaces.realworld.domain.User;
@Name("avatarUpload")
- at Scope(ScopeType.SESSION)
+ at Scope(ScopeType.CONVERSATION)
public class AvatarUpload implements Serializable{
@In(create=true)
@@ -47,52 +47,6 @@
public boolean isAutoUpload() {
return autoUpload;
}
-
- /*public FileItem loadAvatar(User user){
- FileItem file = new FileItem();
- file.setName(user.getAvatarPath());
- File image = fileManager.getImage(user.getLogin() + fileManager.getFileSeparator() + "avatars"+ fileManager.getFileSeparator() + user.getAvatarPath());
- InputStream paintData = null;
- byte[] data = new byte[(int)image.length() - 1];
- FileInputStream fileInputStream = null;
- BufferedInputStream bufferedInputStream = null;
- if (image != null) {
- try {
- fileInputStream = new FileInputStream(image);
- bufferedInputStream = new BufferedInputStream(fileInputStream);
- paintData = bufferedInputStream;
- paintData.read(data);
- } catch (FileNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }finally{
- try {
- fileInputStream.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- try {
- bufferedInputStream.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- try {
- paintData.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
- file.setData(data);
- return file;
- }*/
public void setAutoUpload(boolean autoUpload) {
this.autoUpload = autoUpload;
Modified: 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 2008-12-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileLoader.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -4,18 +4,19 @@
import java.io.OutputStream;
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.Scope;
@Name("fileLoader")
- at Scope(ScopeType.SESSION)
+ at Scope(ScopeType.CONVERSATION)
public class FileLoader {
- @In FileUploadBean fileUploadBean;
- @Begin(join=true)
+ @In
+ FileWrapper fileWrapper;
public synchronized void paint(OutputStream stream, Object object) throws IOException {
- stream.write(fileUploadBean.getFiles().get((Integer)object).getData());
+ stream.write(fileWrapper.getFiles().get((Integer)object).getData());
}
}
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java 2008-12-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -6,9 +6,12 @@
import javax.faces.context.FacesContext;
+import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
@Name("fileManager")
+ at Scope(ScopeType.CONVERSATION)
public class FileManager {
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-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -53,15 +53,15 @@
*
*/
@Name("fileUploadBean")
- at Scope(ScopeType.SESSION)
- at Synchronized(timeout=5000)
+ at Scope(ScopeType.CONVERSATION)
+
public class FileUploadBean implements Serializable{
@In
private User user;
- @In(required=false)
- private Image selectedImage;
+ @In(create=true) @Out
+ FileWrapper fileWrapper;
@In(required=false)
private Album selectedAlbum;
@@ -69,19 +69,8 @@
@In(create=true)
private FileManager fileManager;
- private ArrayList<FileItem> files = new ArrayList<FileItem>();
private boolean autoUpload = false;
- public int getSize() {
- if (getFiles().size()>0){
- return getFiles().size();
- }else
- {
- return 0;
- }
- }
-
- @Begin(join=true)
public synchronized void listener(UploadEvent event) throws Exception{
UploadItem item = event.getUploadItem();
FileItem file = new FileItem();
@@ -96,24 +85,24 @@
image.setAlbumName(selectedAlbum.getName());
image.setAlbum(selectedAlbum);
file.setImage(image);
- files.add(file);
+ fileWrapper.getFiles().add(file);
}
public void clearUploadData() {
- files.clear();
+ fileWrapper.getFiles().clear();
}
public void clearSelectedData() {
- for(int i = 0; i < files.size(); i++){
- if(files.get(i).isSelected()){
- files.remove(i);
+ for(int i = 0; i < fileWrapper.getFiles().size(); i++){
+ if(fileWrapper.getFiles().get(i).isSelected()){
+ fileWrapper.getFiles().remove(i);
}
}
}
public void storeSelectedData() {
List<FileItem> temp = new ArrayList<FileItem>();
- for(FileItem file:files){
+ for(FileItem file:fileWrapper.getFiles()){
if(file.isSelected()){
//Save file to disk
String fileName = user.getLogin() + fileManager.getFileSeparator() + selectedAlbum.getName() + fileManager.getFileSeparator() + file.getImage().getPath();
@@ -124,17 +113,16 @@
e.printStackTrace();
}
Events.instance().raiseEvent("addImage", file.getImage());
- //files.remove(file);
}else{
temp.add(file);
}
}
- files.clear();
- files.addAll(temp);
+ fileWrapper.getFiles().clear();
+ fileWrapper.getFiles().addAll(temp);
}
public void storeAll() {
- for(FileItem file:files){
+ for(FileItem file:fileWrapper.getFiles()){
//Save file to disk
String fileName = user.getLogin() + fileManager.getFileSeparator() + selectedAlbum.getName() + fileManager.getFileSeparator() + file.getImage().getPath();
try {
@@ -145,23 +133,14 @@
}
//Update domain model
Events.instance().raiseEvent("addImage", file.getImage());
- //files.remove(file);
}
- files.clear();
+ fileWrapper.getFiles().clear();
}
public long getTimeStamp(){
return System.currentTimeMillis();
}
-
- public ArrayList<FileItem> getFiles() {
- return files;
- }
- public void setFiles(ArrayList<FileItem> files) {
- this.files = files;
- }
-
public boolean isAutoUpload() {
return autoUpload;
}
@@ -170,6 +149,4 @@
this.autoUpload = autoUpload;
}
-}
-
-
+}
\ No newline at end of file
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileWrapper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileWrapper.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileWrapper.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -0,0 +1,30 @@
+package org.richfaces.realworld.fileupload;
+
+import java.util.ArrayList;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+ at Name("fileWrapper")
+ at Scope(ScopeType.SESSION)
+public class FileWrapper {
+
+ private ArrayList<FileItem> files = new ArrayList<FileItem>();
+ public int getSize() {
+ if (getFiles().size()>0){
+ return getFiles().size();
+ }else
+ {
+ return 0;
+ }
+ }
+
+ public ArrayList<FileItem> getFiles() {
+ return files;
+ }
+
+ public void setFiles(ArrayList<FileItem> files) {
+ this.files = files;
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileWrapper.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/session/Authenticator.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -15,6 +15,8 @@
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.jboss.seam.core.Events;
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.log.Log;
@@ -60,7 +62,6 @@
/* (non-Javadoc)
* @see org.richfaces.realworld.service.IAuthenticator#authenticate()
*/
- @Begin
public boolean authenticate()
{
if(null == identity.getUsername() || identity.getUsername().equals("")){
@@ -83,14 +84,14 @@
}
}
selectedUser = user;
- for(User u:user.getFriends()){
+ /*for(User u:user.getFriends()){
for(Album a :u.getChildAlbums()){
a.getImages().get(0);
}
}
for(Album a:user.getSharedAlbums()){
a.getImages().get(0);
- }
+ }*/
Events.instance().raiseEvent("updateMainArea", NavigationEnum.IMAGE_PREVIEW);
return true;
}
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-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeActionManager.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -85,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()));
@@ -96,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){
@@ -120,7 +120,7 @@
treeRoot.updateChild(album);
}
- @Transactional(TransactionPropagationType.REQUIRED)
+
public void deleteAlbum(Album album){
String albumName = album.getName();
albumAction.deleteAlbum(album);
@@ -131,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();
@@ -146,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());
@@ -168,7 +168,7 @@
}
}
- @Transactional(TransactionPropagationType.REQUIRED)
+
@Observer("addImage")
public void addImage(Image image) {
imageAction.addImage(image);
@@ -178,15 +178,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);
@@ -195,16 +195,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();
@@ -217,7 +217,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){
@@ -237,20 +237,20 @@
throw new Exception("This user won't be your friend!");
}*/
}
- @Transactional(TransactionPropagationType.REQUIRED)
+
public void addToSharedAlbums(Image image){
userAction.addSharedAlbum(image.getAlbum());
}
- @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);
@@ -260,7 +260,7 @@
selectedImageIndex.setSelectedImageIndex(1);
}
- @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-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/TreeSelectionManager.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -223,6 +223,7 @@
}
public void processSelection(NodeSelectedEvent event) {
+ try{
HtmlTree tree = (HtmlTree) event.getComponent();
if (tree.getRowData() instanceof TreeImageItem) {
nodeTitle = ((TreeImageItem) (tree.getRowData())).getImage()
@@ -258,6 +259,10 @@
}
}
}
+ }
+ catch(Exception e){
+ //Bla-bla-bla
+ }
}
public void updateScroller(ActionEvent event){
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ComboboxHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ComboboxHelper.java 2008-12-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ComboboxHelper.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -1,5 +1,6 @@
package org.richfaces.realworld.util;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -11,7 +12,7 @@
@Name("comboboxHelper")
@Scope(ScopeType.CONVERSATION)
-public class ComboboxHelper {
+public class ComboboxHelper implements Serializable{
private String albumName;
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-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/FriendHelper.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -44,15 +44,13 @@
@In(required=false)
ComboboxHelper comboboxHelper;
- @Begin(join=true)
public void chooseAlbum(User friend){
selectedUser = friend;
- selectedAlbum = selectedUser.getAlbumByName(comboboxHelper.getAlbumName());
+ selectedAlbum = friend.getAlbumByName(comboboxHelper.getAlbumName());
selectedImage = selectedAlbum.getImages().get(0);
selectedImageIndex.setSelectedImageIndex(1);
}
- @Begin(join=true)
public void chooseAlbum(Album album){
selectedUser = album.getOwner();
selectedAlbum = album;
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-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2008-12-18 12:09:08 UTC (rev 11867)
@@ -28,9 +28,6 @@
@In(create=true)
FileManager fileManager;
- @In(required=false)
- private User user;
-
public synchronized void paintSearchImage(OutputStream stream, Object object) throws IOException {
Image painted = (Image)object;
@@ -107,7 +104,8 @@
if (null == data) {
return;
}
- File imageResource = fileManager.getImage(user.getLogin() + fileManager.getFileSeparator() + "avatars" + fileManager.getFileSeparator() + data.toString());
+ User user = (User)data;
+ File imageResource = fileManager.getImage(user.getLogin() + fileManager.getFileSeparator() + "avatars" + fileManager.getFileSeparator() + user.getAvatarPath());
if (imageResource != null) {
FileInputStream fileInputStream = new FileInputStream(imageResource);
BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
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-18 11:55:31 UTC (rev 11866)
+++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml 2008-12-18 12:09:08 UTC (rev 11867)
@@ -20,7 +20,7 @@
<core:init debug="true" jndi-pattern="@jndiPattern@"/>
- <core:manager concurrent-request-timeout="2000"
+ <core:manager concurrent-request-timeout="20000"
conversation-timeout="120000"
conversation-id-parameter="cid"/>
<persistence:managed-persistence-context name="entityManager"
Modified: trunk/test-applications/realworld/web/src/main/webapp/fileUpload.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/index.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/navigation.xhtml
===================================================================
(Binary files differ)
More information about the richfaces-svn-commits
mailing list