Author: amarkhel Date: 2009-03-20 13:11:11 -0400 (Fri, 20 Mar 2009) New Revision: 13067 Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelvesList.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml Removed: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/albums.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelves.xhtml Modified: trunk/test-applications/realworld2/web/META-INF/MANIFEST.MF trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldCommandButtonRenderer.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/PasswordHolder.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/DirectLinkHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileManagerTest.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java trunk/test-applications/realworld2/web/src/main/webapp/includes/album.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/albumEdit.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageEditInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/imageEdit.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/images.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/publicShelves.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfEdit.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedAlbums.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelves.xhtml trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml Log: Modified: trunk/test-applications/realworld2/web/META-INF/MANIFEST.MF =================================================================== --- trunk/test-applications/realworld2/web/META-INF/MANIFEST.MF 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/META-INF/MANIFEST.MF 2009-03-20 17:11:11 UTC (rev 13067) @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Class-Path: avalon-framework-4.1.3.jar commons-beanutils-1.7.0.jar com - mons-digester-1.8.jar commons-logging-1.1.jar jboss-seam-debug-2.1.0. + mons-digester-2.0.jar commons-logging-1.1.jar jboss-seam-debug-2.1.0. SP1.jar jboss-seam-jul-2.1.0.SP1.jar jboss-seam-remoting-2.1.0.SP1.ja r jboss-seam-ui-2.1.0.SP1.jar jsf-facelets-1.1.14.jar junit-3.8.jar l og4j-1.2.14.jar logkit-1.0.1.jar metadata-extractor-2.4.0-beta1.jar r - ichfaces-impl-3.3.0.GA.jar richfaces-ui-3.3.0.GA.jar + ichfaces-impl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/listener/CopyImagesStuff.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -4,18 +4,12 @@ package org.richfaces.realworld.listener; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.util.Properties; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.contexts.Contexts; -import org.richfaces.realworld.manager.FileManager; - /** * @author Andrey Markavtsov * Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -23,6 +23,7 @@ import java.io.Serializable; import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; @@ -32,29 +33,26 @@ import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.domain.User; -import org.richfaces.realworld.service.Constants; import org.richfaces.realworld.service.IAlbumAction; import org.richfaces.realworld.util.FlushStrategy; @Name("albumManager") @Scope(ScopeType.CONVERSATION) +@AutoCreate public class AlbumManager implements Serializable{ private static final long serialVersionUID = 2631634926126857691L; private String oncomplete = ";"; - @In(create=true) FlushStrategy flushStrategy; - @In(create=true, required=true) - private IAlbumAction albumAction; + @In FlushStrategy flushStrategy; + @In private IAlbumAction albumAction; @In(create=true, required=true) @Out private Album album; - @In - private User user; + @In private User user; - @In(create=true) - FileManager fileManager; + @In FileManager fileManager; @In FacesMessages facesMessages; @In @Out Model model; @@ -65,8 +63,7 @@ } albumAction.addAlbum(album, flushStrategy.isDatabaseStoreStrategy()); addDirectory(); - model.setSelectedImage(null); - model.setSelectedAlbum(album); + model.resetModel(model.getMainArea(), model.getSelectedUser(), model.getSelectedShelf(), album, null); Events.instance().raiseEvent("albumAdded"); Events.instance().raiseEvent("clearTree"); setOncomplete(); @@ -79,8 +76,7 @@ public void editAlbum(Album album){ albumAction.editAlbum(album, flushStrategy.isDatabaseStoreStrategy()); - model.setSelectedAlbum(album); - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); + model.resetModel(NavigationEnum.ALBUM_PREVIEW, model.getSelectedUser(), model.getSelectedShelf(), album, null); Events.instance().raiseEvent("albumEdited"); } @@ -89,8 +85,7 @@ String string = album.getId().toString(); albumAction.deleteAlbum(album, flushStrategy.isDatabaseStoreStrategy()); deleteDirectory(string); - model.setSelectedImage(null); - model.setSelectedAlbum(null); + model.resetModel(model.getMainArea(), model.getSelectedUser(), model.getSelectedShelf(), null, null); Events.instance().raiseEvent("albumDeleted"); Events.instance().raiseEvent("clearTree"); } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -22,13 +22,9 @@ import java.io.Serializable; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; import javax.security.auth.login.LoginException; import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.End; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; @@ -42,16 +38,16 @@ import org.jboss.seam.security.Identity; import org.jboss.seam.web.Session; import org.richfaces.realworld.domain.User; +import org.richfaces.realworld.service.Constants; import org.richfaces.realworld.service.IUserAction; import org.richfaces.realworld.ui.PasswordHolder; -import org.richfaces.realworld.service.Constants; @Name("authenticator") @Scope(ScopeType.CONVERSATION) public class Authenticator implements Serializable { - @In(create=true) ShelfManager shelfManager; + @In ShelfManager shelfManager; @In("#{messages['invalid_login']}") private String INVALID_LOGIN_OR_PASSWORD; @@ -60,7 +56,7 @@ private static final long serialVersionUID = -4585673256547342140L; - @In(create=true) PasswordHolder passwordHolder; + @In PasswordHolder passwordHolder; @Logger Log log; @@ -73,11 +69,9 @@ @In("#{conversation}") @Out Conversation conversation; - @In(create = true) - IUserAction userAction; + @In IUserAction userAction; - @In - FileManager fileManager; + @In FileManager fileManager; @In(create=true) @Out Model model; @@ -112,7 +106,7 @@ User user = userAction.login(credentials.getUsername(), passwordHolder.hash(credentials.getPassword())); if (user != null) { identity.addRole(Constants.ADMIN_ROLE); - model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null, null); + model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null); return true; } } catch (Exception nre) { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -21,11 +21,7 @@ package org.richfaces.realworld.manager; import java.io.Serializable; -import java.util.Map; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; @@ -33,9 +29,7 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Synchronized; import org.jboss.seam.core.Events; -import org.richfaces.component.UIDatascroller; import org.richfaces.event.DataScrollerEvent; -import org.richfaces.event.scroll.ScrollEvent; import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.MetaTag; @@ -59,15 +53,15 @@ private User user; public void selectShelfs(){ - model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null, null ); + model.resetModel(NavigationEnum.ALL_SHELFS, user, null, null, null); } public void selectAlbums(){ - model.resetModel(NavigationEnum.ALL_ALBUMS, user, null, null, null, null ); + model.resetModel(NavigationEnum.ALL_ALBUMS, user, null, null, null); } public void selectImages(){ - model.resetModel(NavigationEnum.ALL_IMAGES, user, null, null, null, null ); + model.resetModel(NavigationEnum.ALL_IMAGES, user, null, null, null); } public void startEditShelf(Shelf shelf){ @@ -75,7 +69,7 @@ pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } - model.resetModel(NavigationEnum.SHELF_EDIT, shelf.getOwner(), shelf, null, null, null ); + model.resetModel(NavigationEnum.SHELF_EDIT, shelf.getOwner(), shelf, null, null); } public void cancelEditShelf(Shelf shelf){ @@ -87,7 +81,7 @@ pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } - model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getOwner(), album.getShelf(), album, null, null ); + model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getOwner(), album.getShelf(), album, null); } public void showImage(Image image){ @@ -95,7 +89,7 @@ pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } - model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image, null ); + model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image); model.setSelectedImageIndex(model.getSelectedAlbum().getIndex(model.getSelectedImage())+1); image.getAlbum().getShelf().visitImage(image); image.getAlbum().visitImage(image); @@ -105,7 +99,7 @@ Integer index = e.getPage(); model.setSelectedImageIndex(index); Image image = model.getSelectedAlbum().getImages().get(index - 1); - model.setSelectedImage(image); + model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image); image.getAlbum().visitImage(image); image.getAlbum().getShelf().visitImage(image); } @@ -123,7 +117,7 @@ } public void showShelf(Shelf shelf){ - model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null, null); + model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null); } public boolean isUserImage(Image image){ @@ -150,11 +144,11 @@ } public void showSharedAlbums(User user){ - model.resetModel(NavigationEnum.USER_SHARED_ALBUMS, user, null, null, null, null); + model.resetModel(NavigationEnum.USER_SHARED_ALBUMS, user, null, null, null); } public void showSharedImages(User user){ - model.resetModel(NavigationEnum.USER_SHARED_IMAGES, user, null, null, null, null); + model.resetModel(NavigationEnum.USER_SHARED_IMAGES, user, null, null, null); } public boolean isAccessToAlbumGranted(Album album){ @@ -173,19 +167,20 @@ } public void showUser(User user){ - model.resetModel(NavigationEnum.USER_PREFS, user, null, null, null, null); + model.resetModel(NavigationEnum.USER_PREFS, user, null, null, null); } public void showUnvisitedImages(Shelf shelf){ - model.resetModel(NavigationEnum.SHELF_UNVISITED, shelf.getOwner(), shelf, shelf.getFirstAlbum(), null, null); + model.resetModel(NavigationEnum.SHELF_UNVISITED, shelf.getOwner(), shelf, shelf.getFirstAlbum(), null); } public void showUnvisitedImages(Album album){ - model.resetModel(NavigationEnum.ALBUM_UNVISITED, album.getOwner(), album.getShelf(), album, null, null); + model.resetModel(NavigationEnum.ALBUM_UNVISITED, album.getOwner(), album.getShelf(), album, null); } public void showTag(MetaTag metatag){ - model.resetModel(NavigationEnum.TAGS, model.getSelectedUser(), model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage(), metatag); + model.resetModel(NavigationEnum.TAGS, model.getSelectedUser(), model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage()); + model.setSelectedTag(metatag); } private boolean canViewShelf(Shelf shelf) { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -39,11 +39,9 @@ public class DnDManager implements DropListener { @In User user; - @In(create=true) - FileManager fileManager; - @In(create=true) - IAlbumAction albumAction; - @In(create=true) FlushStrategy flushStrategy; + @In FileManager fileManager; + @In IAlbumAction albumAction; + @In FlushStrategy flushStrategy; public void processDrop(DropEvent dropEvent) { Dropzone dropzone = (Dropzone) dropEvent.getComponent(); Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -34,7 +34,6 @@ import java.util.List; import java.util.Properties; -import javax.faces.context.FacesContext; import javax.imageio.ImageIO; import javax.imageio.ImageReader; import javax.imageio.ImageWriter; @@ -44,7 +43,6 @@ import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Startup; import org.richfaces.realworld.service.Constants; @Name("fileManager") Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -21,8 +21,10 @@ package org.richfaces.realworld.manager; import java.util.Date; +import java.util.List; import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; @@ -31,6 +33,7 @@ import org.jboss.seam.core.Events; import org.richfaces.realworld.domain.Comment; import org.richfaces.realworld.domain.Image; +import org.richfaces.realworld.domain.MetaTag; import org.richfaces.realworld.domain.User; import org.richfaces.realworld.service.Constants; import org.richfaces.realworld.service.IImageAction; @@ -39,21 +42,18 @@ @Name("imageManager") @Scope(ScopeType.CONVERSATION) +@AutoCreate public class ImageManager { - @In(create=true, required=true) - private IImageAction imageAction; + @In IImageAction imageAction; @In FlushStrategy flushStrategy; - @In(create=true) - FileManager fileManager; + @In FileManager fileManager; @In @Out Model model; - @In - private User user; + @In private User user; - @In(create=true) - private DirectLinkHelper directLink; + @In private DirectLinkHelper directLink; public void deleteImage(Image image){ String imagePath = image.getPath(); @@ -71,8 +71,7 @@ @Observer(Constants.ADD_IMAGE_EVENT) public void addImage(Image image) { imageAction.addImage(image, flushStrategy.isDatabaseStoreStrategy()); - model.setSelectedAlbum(image.getAlbum()); - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW); + model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, model.getSelectedUser(), model.getSelectedShelf(), image.getAlbum(), image); Events.instance().raiseEvent("imageAdded"); } @@ -97,4 +96,8 @@ public String getImageDirectLink(Image image) { return directLink.getDirectImageLink(image.getId()); } + + public List<MetaTag> popularTags(){ + return imageAction.popularTags(); + } } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -29,12 +29,11 @@ private NavigationEnum mainArea; - public void resetModel(NavigationEnum mainArea, User selectedUser, Shelf selectedShelf, Album selectedAlbum, Image selectedImage, MetaTag selectedTag){ + public void resetModel(NavigationEnum mainArea, User selectedUser, Shelf selectedShelf, Album selectedAlbum, Image selectedImage){ this.setMainArea(mainArea); this.setSelectedAlbum(selectedAlbum); this.setSelectedImage(selectedImage); this.setSelectedShelf(selectedShelf); - this.setSelectedTag(selectedTag); this.setSelectedUser(selectedUser); } @@ -59,7 +58,7 @@ return selectedImage; } - public void setSelectedImage(Image selectedImage) { + private void setSelectedImage(Image selectedImage) { this.selectedImage = selectedImage; } @@ -67,7 +66,7 @@ return selectedAlbum; } - public void setSelectedAlbum(Album selectedAlbum) { + private void setSelectedAlbum(Album selectedAlbum) { this.selectedAlbum = selectedAlbum; } @@ -75,7 +74,7 @@ return selectedUser; } - public void setSelectedUser(User selectedUser) { + private void setSelectedUser(User selectedUser) { this.selectedUser = selectedUser; } @@ -83,7 +82,7 @@ return selectedShelf; } - public void setSelectedShelf(Shelf selectedShelf) { + private void setSelectedShelf(Shelf selectedShelf) { this.selectedShelf = selectedShelf; } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -30,7 +30,7 @@ SHELF_PREVIEW("/includes/shelf.xhtml"), ALL_SHELFS("/includes/userShelves.xhtml"), TAGS("includes/tag.xhtml"), - ALL_ALBUMS("/includes/albums.xhtml"), + ALL_ALBUMS("/includes/userAlbums.xhtml"), ALL_IMAGES("/includes/images.xhtml"), ALBUM_IMAGE_EDIT("/includes/imageEdit.xhtml"), ALBUM_EDIT("/includes/albumEdit.xhtml"), Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -3,14 +3,12 @@ import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import javax.security.auth.login.LoginException; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.End; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.log.Log; @@ -40,9 +38,8 @@ @In FacesMessages facesMessages; - @In(create=true) PasswordHolder passwordHolder; - @In(create = true) - IUserAction userAction; + @In PasswordHolder passwordHolder; + @In IUserAction userAction; @End public String register(User user){ Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -25,6 +25,7 @@ import java.util.List; import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; @@ -35,26 +36,24 @@ import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.domain.User; -import org.richfaces.realworld.service.Constants; import org.richfaces.realworld.service.IShelfAction; import org.richfaces.realworld.util.FlushStrategy; @Name("shelfManager") @Scope(ScopeType.CONVERSATION) +@AutoCreate public class ShelfManager implements Serializable{ private static final long serialVersionUID = 2631634926126857691L; private List<Shelf> shelfs; - @In private FileManager fileManager; - @In(create=true, required=true) - private IShelfAction shelfAction; + @In FileManager fileManager; + @In IShelfAction shelfAction; private String oncomplete = ";"; @In FlushStrategy flushStrategy; @In @Out Model model; - @In - private User user; + @In User user; public void initEdit(){ Shelf shelf = new Shelf(); @@ -63,9 +62,7 @@ public void addShelf(Shelf shelf){ shelfAction.addShelf(shelf, flushStrategy.isDatabaseStoreStrategy()); - model.setSelectedImage(null); - model.setSelectedAlbum(null); - model.setSelectedShelf(shelf); + model.resetModel(model.getMainArea(), model.getSelectedUser(),shelf, null, null); setOncomplete(); Events.instance().raiseEvent("clearTree"); } @@ -76,8 +73,7 @@ public void editShelf(Shelf shelf){ shelfAction.editShelf(shelf, flushStrategy.isDatabaseStoreStrategy()); - model.setSelectedShelf(shelf); - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW); + model.resetModel(NavigationEnum.SHELF_PREVIEW, model.getSelectedUser(),shelf, null, null); } public void deleteShelf(Shelf shelf){ @@ -88,7 +84,7 @@ } shelfAction.deleteShelf(shelf, flushStrategy.isDatabaseStoreStrategy()); deleteDirectories(directoriesToDelete); - model.resetModel(NavigationEnum.ALL_SHELFS, model.getSelectedUser(), null, null, null, null); + model.resetModel(NavigationEnum.ALL_SHELFS, model.getSelectedUser(), null, null, null); Events.instance().raiseEvent("clearTree"); } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -7,14 +7,10 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.core.Events; import org.richfaces.component.UITree; -import org.richfaces.component.html.HtmlTree; -import org.richfaces.event.NodeSelectedEvent; import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.domain.User; -import org.richfaces.realworld.service.Constants; @Name("treeManager") @Scope(ScopeType.CONVERSATION) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -21,9 +21,7 @@ package org.richfaces.realworld.manager; import java.io.Serializable; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; @@ -32,7 +30,6 @@ import org.jboss.seam.annotations.Scope; import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.domain.User; import org.richfaces.realworld.service.IUserAction; @@ -42,15 +39,11 @@ private static final long serialVersionUID = 6027103521084558931L; - @In - private User user; + @In private User user; private Long countImages; private Long countAlbums; - private Long countSharedImages; - private Long countSharedAlbums; - @In(create=true, required=true) - private IUserAction userAction; + @In private IUserAction userAction; public Long countImages(User u) { if(null == countImages ){ @@ -60,17 +53,11 @@ } public Long countSharedImages(User u) { - if(null == countSharedImages ){ - countSharedImages = userAction.countSharedImages(u); - } - return countSharedImages; + return userAction.countSharedImages(u); } public Long countSharedAlbums(User u) { - if(null == countSharedAlbums ){ - countSharedAlbums = userAction.countSharedAlbums(user); - } - return countSharedAlbums; + return userAction.countSharedAlbums(user); } public Long countAlbums(User u) { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -6,16 +6,12 @@ import java.util.Iterator; import java.util.List; -import javax.faces.event.ActionEvent; - import org.jboss.seam.ScopeType; 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.jboss.seam.core.Events; -import org.richfaces.realworld.manager.Controller; import org.richfaces.realworld.manager.NavigationEnum; import org.richfaces.realworld.service.Constants; import org.richfaces.realworld.service.ISearchAction; @@ -26,8 +22,7 @@ private static final long serialVersionUID = -304368268896942902L; - @In(create=true, required=true) - ISearchAction searchAction; + @In ISearchAction searchAction; ISearchOption selectedOption; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -4,7 +4,6 @@ import java.util.List; import java.util.Map; -import org.jboss.seam.core.Events; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.service.ISearchAction; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; -import org.jboss.seam.core.Events; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.service.ISearchAction; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -5,7 +5,6 @@ import java.util.List; -import org.jboss.seam.core.Events; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.service.ISearchAction; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -5,7 +5,6 @@ import java.util.List; -import org.jboss.seam.core.Events; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.service.ISearchAction; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldCommandButtonRenderer.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldCommandButtonRenderer.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldCommandButtonRenderer.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -8,10 +8,8 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import javax.faces.render.Renderer; import org.ajax4jsf.renderkit.AjaxCommandRendererBase; -import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.renderkit.RendererUtils.HTML; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -21,10 +21,7 @@ package org.richfaces.realworld.ui; import java.io.Serializable; -import java.util.ArrayList; -import javax.faces.event.ActionEvent; - import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; @@ -32,7 +29,6 @@ import org.jboss.seam.annotations.Scope; import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.domain.MetaTag; import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.manager.AlbumManager; import org.richfaces.realworld.manager.ImageManager; @@ -57,14 +53,11 @@ @In(create=true, required=true) @Out(required=false) private Album album; - @In(create=true) - private AlbumManager albumManager; + @In AlbumManager albumManager; - @In(create=true) - private ShelfManager shelfManager; + @In ShelfManager shelfManager; - @In(create=true) - private ImageManager imageManager; + @In ImageManager imageManager; public void initImagePopup( String actionName, String caption, Image image){ this.caption = caption; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/PasswordHolder.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/PasswordHolder.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/PasswordHolder.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -1,10 +1,13 @@ package org.richfaces.realworld.ui; import java.security.MessageDigest; + +import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.Name; import org.jboss.seam.util.Hex; @Name("passwordHolder") +@AutoCreate public class PasswordHolder { private String digestAlgorithm; private String charset; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -21,7 +21,6 @@ import org.richfaces.realworld.domain.User; import org.richfaces.realworld.manager.FileManager; import org.richfaces.realworld.manager.Model; -import org.richfaces.realworld.manager.RegistrationManager; import org.richfaces.realworld.service.Constants; import org.richfaces.realworld.service.IUserAction; import org.richfaces.realworld.util.FlushStrategy; @@ -34,15 +33,12 @@ @Scope(ScopeType.SESSION) public class UserPrefsHelper { - @In(create=true) - IUserAction userAction; + @In IUserAction userAction; - @In(create=true) - FileManager fileManager; + @In FileManager fileManager; @In FlushStrategy flushStrategy; @In(create=true) @Out Model model; - @In - User user; + @In User user; Boolean avatarModalOpened = false; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/DirectLinkHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/DirectLinkHelper.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/DirectLinkHelper.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -15,17 +15,20 @@ import javax.servlet.http.HttpServletRequest; import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.web.RequestParameter; import org.jboss.seam.core.Events; +import org.jboss.seam.security.Identity; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.manager.FileManager; import org.richfaces.realworld.service.Constants; @Name("directLink") @Scope(ScopeType.SESSION) +@AutoCreate public class DirectLinkHelper { @In(value="entityManager") protected EntityManager em; @@ -34,41 +37,47 @@ @RequestParameter protected Long imageId; + @In Identity identity; + private Long id; private static final String IMAGE_DIRECT_LINK = "/includes/directImage.seam?imageId="; private static String imageDirectLinkPrefix; - public synchronized void paintImage(OutputStream out, Object data) throws IOException { Image im = em.find(Image.class, id); - File imageResource = fileManager.getImage(im.getPath()); - if (imageResource != null) { - FileInputStream fileInputStream = new FileInputStream(imageResource); - BufferedInputStream bufferedInputStream = new BufferedInputStream( - fileInputStream); - InputStream paintData = bufferedInputStream; - if (null == paintData) { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, - new Exception("")); - return; + if(im.getAlbum().getShelf().isShared() || (identity.hasRole("admin") && im.getAlbum().getOwner().getLogin().equals(identity.getUsername()))){ + File imageResource = fileManager.getImage(im.getPath()); + if (imageResource != null) { + FileInputStream fileInputStream = new FileInputStream(imageResource); + BufferedInputStream bufferedInputStream = new BufferedInputStream( + fileInputStream); + InputStream paintData = bufferedInputStream; + if (null == paintData) { + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, + new Exception("")); + return; + } + try { + BufferedImage images = ImageIO.read(paintData); + ImageIO.write(images, Constants.JPEG, out); + } catch (Exception e) { + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, + new Exception("")); + return; + } finally { + fileInputStream.close(); + bufferedInputStream.close(); + paintData.close(); + } } - try { - BufferedImage images = ImageIO.read(paintData); - ImageIO.write(images, Constants.JPEG, out); - } catch (Exception e) { - Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, - new Exception("")); - return; - } finally { - fileInputStream.close(); - bufferedInputStream.close(); - paintData.close(); - } + }else{ + return; } } + public void start(){ id=imageId; } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileManagerTest.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileManagerTest.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileManagerTest.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -1,11 +1,9 @@ package org.richfaces.realworld.util; -import java.io.IOException; +import junit.framework.TestCase; import org.richfaces.realworld.manager.FileManager; -import junit.framework.TestCase; - public class FileManagerTest extends TestCase { protected void setUp() throws Exception { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2009-03-20 17:11:11 UTC (rev 13067) @@ -45,8 +45,7 @@ private static final long serialVersionUID = -1572789608594870285L; - @In(create=true) - FileManager fileManager; + @In FileManager fileManager; @In("#{messages['file_processing_error']}") private String FILE_PROCESSING_ERROR; Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumEdit.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml =================================================================== (Binary files differ) Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/albums.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageEditInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/imageEdit.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/images.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/publicShelves.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-20 17:10:23 UTC (rev 13066) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-20 17:11:11 UTC (rev 13067) @@ -16,8 +16,8 @@ <a4j:mediaOutput rendered="#{!album.isEmpty()}" id="img" element="img" createContent="#{imageLoader.paintImage}" styleClass="album-cover-image" - style="#{richx:rectangle(album.lastImage.width, album.lastImage.height, 120)}" - value="#{fileManager.transformPath(album.lastImage.path, '_mini')}"> + style="#{richx:rectangle(album.coveringImage.width, album.coveringImage.height, 120)}" + value="#{fileManager.transformPath(album.coveringImage.path, '_mini')}"> </a4j:mediaOutput> <h:graphicImage rendered="#{album.isEmpty()}" style="width:80px; height:80px;" Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfInfo.xhtml =================================================================== (Binary files differ) Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml =================================================================== (Binary files differ) Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelves.xhtml =================================================================== (Binary files differ) Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelvesList.xhtml (from rev 13053, trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelves.xhtml) =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfEdit.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml =================================================================== (Binary files differ) Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml (from rev 13053, trunk/test-applications/realworld2/web/src/main/webapp/includes/albums.xhtml) =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedAlbums.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelves.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml =================================================================== (Binary files differ)