Author: Alex.Kolonitsky Date: 2009-04-20 04:37:38 -0400 (Mon, 20 Apr 2009) New Revision: 13672 Added: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/ trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/photoalbum.skin.properties trunk/test-applications/realworld2/web/src/main/resources/org/richfaces/photoalbum/ Removed: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/realworld/ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/realworld.skin.properties trunk/test-applications/realworld2/web/src/main/resources/org/richfaces/realworld/ Modified: trunk/test-applications/realworld2/ear/pom.xml trunk/test-applications/realworld2/ear/src/main/application/jboss-app.xml trunk/test-applications/realworld2/ejb/pom.xml trunk/test-applications/realworld2/ejb/sql/short/import.sql trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Comment.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Image.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/MetaTag.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Sex.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/User.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ActionTools.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/AlbumAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IAlbumAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IImageAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ISearchAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IShelfAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IUserAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ImageAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/RealworldException.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/SearchAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ShelfAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/UserAction.java trunk/test-applications/realworld2/pom.xml trunk/test-applications/realworld2/tests/pom.xml trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RichSeleniumTest.java trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/TestAnnotationTransformer.java trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/testng/LoginTest.java trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/testng/OpenAreasUseCasesTest.java trunk/test-applications/realworld2/tests/src/test/resources/testng.xml trunk/test-applications/realworld2/web/pom.xml trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/AlbumManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/DnDManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/ImageManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Model.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/NavigationEnum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/ShelfManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/TreeManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/UserManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ConfirmationPopupHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/DirectLinkHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/EditorBean.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ErrorHandlerBean.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/FileWrapper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/Help.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ImageLoader.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ImageSizeHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/UserPrefsHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/ActionMapperTagHandler.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/FileUtils.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/ImageDimension.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/SessionListener.java trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml Log: Modified: trunk/test-applications/realworld2/ear/pom.xml =================================================================== --- trunk/test-applications/realworld2/ear/pom.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/ear/pom.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> - <artifactId>realworld</artifactId> + <artifactId>photoalbum</artifactId> <version>1.0-SNAPSHOT</version> </parent> <artifactId>${projectName}-ear</artifactId> Modified: trunk/test-applications/realworld2/ear/src/main/application/jboss-app.xml =================================================================== --- trunk/test-applications/realworld2/ear/src/main/application/jboss-app.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/ear/src/main/application/jboss-app.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -5,6 +5,6 @@ <jboss-app> <loader-repository> - seam.jboss.org:loader=realworld-ear-1.0-SNAPSHOT.ear + seam.jboss.org:loader=photoalbum-ear-1.0-SNAPSHOT.ear </loader-repository> </jboss-app> \ No newline at end of file Modified: trunk/test-applications/realworld2/ejb/pom.xml =================================================================== --- trunk/test-applications/realworld2/ejb/pom.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/ejb/pom.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> - <artifactId>realworld</artifactId> + <artifactId>photoalbum</artifactId> <version>1.0-SNAPSHOT</version> </parent> <artifactId>${projectName}-ejb</artifactId> Modified: trunk/test-applications/realworld2/ejb/sql/short/import.sql =================================================================== --- trunk/test-applications/realworld2/ejb/sql/short/import.sql 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/ejb/sql/short/import.sql 2009-04-20 08:37:38 UTC (rev 13672) @@ -13,18 +13,18 @@ INSERT INTO metatags(metatag_id, tag) VALUES (0, 'Animals'); INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (0, '1750979205_6e51b47ce9_o.jpg', '1750979205_6e51b47ce9_o.jpg', 'Animals - 1750979205_6e51b47ce9_o.jpg image', '2009-12-18', 0, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 0); +INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 0); INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (1, '1906662004_655d0f6ccf_o.jpg', '1906662004_655d0f6ccf_o.jpg', 'Animals - 1906662004_655d0f6ccf_o.jpg image', '2009-12-18', 0, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 1); - INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (0, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',1, 2); +INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 1); +INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (0, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',1, 2); INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (2, '2090459727_f2888e5cbe_o.jpg', '2090459727_f2888e5cbe_o.jpg', 'Animals - 2090459727_f2888e5cbe_o.jpg image', '2009-12-18', 0, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 2); - INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (1, '1985-01-08', 'nice shot =) ',2, 3); +INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 2); +INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (1, '1985-01-08', 'nice shot =) ',2, 3); INSERT INTO images(image_id, name, path, description, created, album_id, cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (3, '2297752925_de29b5fb10_o.jpg', '2297752925_de29b5fb10_o.jpg', 'Animals - 2297752925_de29b5fb10_o.jpg image', '2009-12-18', 0, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true); - INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 3); - INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (2, '1985-01-08', 'that is a beautiful flower with great colours ',3, 2); - INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (3, '1985-01-08', 'Perfecft!',3, 3); - INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (4, '1985-01-08', 'love every thing about this picture, really beautiful... :))',3, 3); +INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 3); +INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (2, '1985-01-08', 'that is a beautiful flower with great colours ',3, 2); +INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (3, '1985-01-08', 'Perfecft!',3, 3); +INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (4, '1985-01-08', 'love every thing about this picture, really beautiful... :))',3, 3); UPDATE albums set coveringimage_image_id=3 where album_id = 0; --------------------------------------------------------------------- Copied: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum (from rev 13670, trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld) Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.domain; +package org.richfaces.photoalbum.domain; import java.io.File; import java.io.Serializable; Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Comment.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Comment.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Comment.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.domain; +package org.richfaces.photoalbum.domain; import java.io.Serializable; import java.util.Date; Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Image.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Image.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -23,7 +23,7 @@ * Last modified by: $Author$ * $Revision$ $Date$ */ -package org.richfaces.realworld.domain; +package org.richfaces.photoalbum.domain; import java.io.Serializable; import java.util.ArrayList; @@ -59,7 +59,7 @@ import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.richfaces.realworld.service.ActionTools; +import org.richfaces.photoalbum.service.ActionTools; @NamedQueries({ @NamedQuery( Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/MetaTag.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/MetaTag.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/MetaTag.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.domain; +package org.richfaces.photoalbum.domain; import java.io.Serializable; import java.util.ArrayList; Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Sex.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Sex.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Sex.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.domain; +package org.richfaces.photoalbum.domain; /** * Enumeration for representing gender of user Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.domain; +package org.richfaces.photoalbum.domain; import java.io.File; import java.io.Serializable; Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/User.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/domain/User.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.domain; +package org.richfaces.photoalbum.domain; import java.io.File; import java.io.Serializable; Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ActionTools.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ActionTools.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ActionTools.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import java.util.Date; import java.util.Calendar; Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/AlbumAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/AlbumAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import javax.ejb.Stateless; import javax.persistence.EntityManager; @@ -26,7 +26,7 @@ import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -import org.richfaces.realworld.domain.Album; +import org.richfaces.photoalbum.domain.Album; /** * Class for manipulating with album entity. Analogous to DAO pattern. Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/Constants.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; /** Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IAlbumAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IAlbumAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import javax.ejb.Local; -import org.richfaces.realworld.domain.Album; +import org.richfaces.photoalbum.domain.Album; /** * Interface for manipulating with album entity Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IImageAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IImageAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import java.util.List; import javax.ejb.Local; -import org.richfaces.realworld.domain.Comment; -import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.domain.MetaTag; +import org.richfaces.photoalbum.domain.Comment; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; /** * Interface for manipulating with image entity Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ISearchAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ISearchAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import java.util.List; import javax.ejb.Local; -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.domain.User; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; /** * Interface for search actions Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IShelfAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IShelfAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import java.util.List; import javax.ejb.Local; -import org.richfaces.realworld.domain.Shelf; -import org.richfaces.realworld.domain.User; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; /** * Interface for manipulating with shelf entity * Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IUserAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IUserAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import javax.ejb.Local; -import org.richfaces.realworld.domain.User; +import org.richfaces.photoalbum.domain.User; /** * Interface for manipulating with user entity Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ImageAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ImageAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import java.util.ArrayList; import java.util.HashSet; @@ -32,9 +32,9 @@ import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -import org.richfaces.realworld.domain.Comment; -import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.domain.MetaTag; +import org.richfaces.photoalbum.domain.Comment; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; /** * Class for manipulating with image entity. Analogous to DAO pattern. * EJB3 Bean Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/RealworldException.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/RealworldException.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/RealworldException.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import javax.ejb.ApplicationException; Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/SearchAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/SearchAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import java.util.List; @@ -29,11 +29,11 @@ import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -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.domain.User; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; /** * Search Builder Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ShelfAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ShelfAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,20 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import java.util.List; import javax.ejb.Stateless; import javax.persistence.EntityManager; -import javax.persistence.Query; import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; -import org.richfaces.realworld.domain.Shelf; -import org.richfaces.realworld.domain.User; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; /** * Class for manipulating with shelf entity. Analogous to DAO pattern. Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/UserAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/UserAction.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.service; +package org.richfaces.photoalbum.service; import javax.ejb.Stateless; import javax.persistence.EntityManager; @@ -26,7 +26,7 @@ import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -import org.richfaces.realworld.domain.User; +import org.richfaces.photoalbum.domain.User; /** * Class for manipulating with user entity. Analogous to DAO pattern. Copied: trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml (from rev 13670, trunk/test-applications/realworld2/ejb/src/main/resources/realworld-ds.xml) =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml (rev 0) +++ trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE datasources + PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" + "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> + +<datasources> + <local-tx-datasource> + <jndi-name>realWorldDatasource</jndi-name> + <!-- <connection-url>jdbc:postgresql://localhost:5432/photoalbum</connection-url> + <driver-class>org.postgresql.Driver</driver-class> + <user-name>photoalbum</user-name> + <password>photoalbum</password>--> + <connection-url>jdbc:hsqldb:hsql://localhost:9005/photoalbum</connection-url> + <!--<connection-url>jdbc:hsqldb:mem.</connection-url>--> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + </local-tx-datasource> + +</datasources> + Property changes on: trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/test-applications/realworld2/pom.xml =================================================================== --- trunk/test-applications/realworld2/pom.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/pom.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces</groupId> - <artifactId>realworld</artifactId> + <artifactId>photoalbum</artifactId> <packaging>pom</packaging> <version>1.0-SNAPSHOT</version> <name>sample application</name> @@ -13,7 +13,7 @@ </parent> <properties> - <projectName>realworld</projectName> + <projectName>photoalbum</projectName> <richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion> <seamVersion>2.1.1.GA</seamVersion> <faceletsVersion>1.1.15.B1</faceletsVersion> Modified: trunk/test-applications/realworld2/tests/pom.xml =================================================================== --- trunk/test-applications/realworld2/tests/pom.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/tests/pom.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> - <artifactId>realworld</artifactId> + <artifactId>photoalbum</artifactId> <version>1.0-SNAPSHOT</version> </parent> @@ -71,6 +71,12 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-swing</artifactId> + <version>1.7</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> Copied: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum (from rev 13670, trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/realworld) Modified: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java =================================================================== --- trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/realworld/RealWorldHelper.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,7 +1,7 @@ /** * */ -package org.richfaces.realworld; +package org.richfaces.photoalbum; import org.testng.Assert; Modified: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RichSeleniumTest.java =================================================================== --- trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/realworld/RichSeleniumTest.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RichSeleniumTest.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld; +package org.richfaces.photoalbum; public interface RichSeleniumTest { Modified: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java =================================================================== --- trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/realworld/SeleniumTestBase.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld; +package org.richfaces.photoalbum; @@ -62,7 +62,7 @@ static final String STATUS_STOP_ID = "_viewRoot:status.stop"; /** Defines the name of current j2ee application name */ - public static final String APPLICATION_NAME = "realworld"; + public static final String APPLICATION_NAME = "photoalbum"; public SeleniumTestBase() { this("http", "localhost", serverPort); Modified: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/TestAnnotationTransformer.java =================================================================== --- trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/realworld/TestAnnotationTransformer.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/TestAnnotationTransformer.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld; +package org.richfaces.photoalbum; import java.lang.reflect.Constructor; import java.lang.reflect.Method; Modified: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/testng/LoginTest.java =================================================================== --- trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/realworld/testng/LoginTest.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/testng/LoginTest.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,10 +1,10 @@ /** * */ -package org.richfaces.realworld.testng; +package org.richfaces.photoalbum.testng; -import org.richfaces.realworld.RealWorldHelper; -import org.richfaces.realworld.SeleniumTestBase; +import org.richfaces.photoalbum.RealWorldHelper; +import org.richfaces.photoalbum.SeleniumTestBase; import org.testng.annotations.Test; /** Modified: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/testng/OpenAreasUseCasesTest.java =================================================================== --- trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/realworld/testng/OpenAreasUseCasesTest.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/testng/OpenAreasUseCasesTest.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,11 +1,11 @@ /** * */ -package org.richfaces.realworld.testng; +package org.richfaces.photoalbum.testng; -import org.richfaces.realworld.RealWorldHelper; -import org.richfaces.realworld.SeleniumTestBase; -import org.richfaces.realworld.RealWorldHelper.HtmlConstants; +import org.richfaces.photoalbum.RealWorldHelper; +import org.richfaces.photoalbum.SeleniumTestBase; +import org.richfaces.photoalbum.RealWorldHelper.HtmlConstants; import org.testng.annotations.Test; /** Modified: trunk/test-applications/realworld2/tests/src/test/resources/testng.xml =================================================================== --- trunk/test-applications/realworld2/tests/src/test/resources/testng.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/tests/src/test/resources/testng.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite name="seleniumTestDANe"> <!-- test name="IEFunctionalTests"> <parameter name="browser" value="*iexplore"/> @@ -6,7 +6,7 @@ <test name="FireFoxFunctionalTestsDANe"> <parameter name="browser" value="*firefox"/> <packages> - <package name="org.richfaces.realworld.testng" /> + <package name="org.richfaces.photoalbum.testng" /> </packages> </test> </suite> Modified: trunk/test-applications/realworld2/web/pom.xml =================================================================== --- trunk/test-applications/realworld2/web/pom.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/web/pom.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces</groupId> - <artifactId>realworld</artifactId> + <artifactId>photoalbum</artifactId> <version>1.0-SNAPSHOT</version> </parent> <artifactId>${projectName}-web</artifactId> Copied: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum (from rev 13670, trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/AlbumManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/AlbumManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.Serializable; @@ -31,11 +31,11 @@ import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Events; import org.jboss.seam.faces.FacesMessages; -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.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IAlbumAction; @Name("albumManager") @Scope(ScopeType.EVENT) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.Serializable; import java.security.MessageDigest; @@ -29,7 +29,6 @@ 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.Name; import org.jboss.seam.annotations.Scope; @@ -40,9 +39,9 @@ import org.jboss.seam.security.Credentials; import org.jboss.seam.security.Identity; import org.jboss.seam.util.Hex; -import org.richfaces.realworld.domain.User; -import org.richfaces.realworld.service.Constants; -import org.richfaces.realworld.service.IUserAction; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IUserAction; @Name("authenticator") @Scope(ScopeType.CONVERSATION) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.Serializable; @@ -31,12 +31,12 @@ import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Events; -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.domain.User; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; @Name("controller") @Scope(ScopeType.EVENT) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/DnDManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/DnDManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -31,12 +31,12 @@ import org.richfaces.component.Dropzone; import org.richfaces.event.DropEvent; import org.richfaces.event.DropListener; -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.Constants; -import org.richfaces.realworld.service.IAlbumAction; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IAlbumAction; @Name("dndManager") public class DnDManager implements DropListener { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.awt.RenderingHints; import java.awt.image.BufferedImage; @@ -33,13 +33,13 @@ import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.security.Restrict; -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.Constants; -import org.richfaces.realworld.util.FileUtils; -import org.richfaces.realworld.util.ImageDimension; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.util.FileUtils; +import org.richfaces.photoalbum.util.ImageDimension; @Name("fileManager") @Scope(ScopeType.APPLICATION) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileUploadManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/FileUploadManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.FileInputStream; import java.io.IOException; @@ -36,10 +36,10 @@ import org.jboss.seam.core.Events; import org.richfaces.event.UploadEvent; import org.richfaces.model.UploadItem; -import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.service.Constants; -import org.richfaces.realworld.service.IImageAction; -import org.richfaces.realworld.ui.FileWrapper; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IImageAction; +import org.richfaces.photoalbum.ui.FileWrapper; import com.drew.imaging.jpeg.JpegMetadataReader; import com.drew.metadata.Directory; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/ImageManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/ImageManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.util.Date; import java.util.List; @@ -34,12 +34,12 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.security.Restrict; 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; +import org.richfaces.photoalbum.domain.Comment; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IImageAction; @Name("imageManager") @Scope(ScopeType.EVENT) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Model.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/Model.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.Serializable; import java.util.List; @@ -9,12 +9,12 @@ import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.core.Events; -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.domain.User; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; @Name("model") @Scope(ScopeType.CONVERSATION) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/NavigationEnum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/NavigationEnum.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; public enum NavigationEnum { ANONYM("includes/publicShelves.xhtml"), Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/ShelfManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/ShelfManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.Serializable; import java.util.List; @@ -27,15 +27,14 @@ import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.security.Restrict; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Events; -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.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IShelfAction; @Name("shelfManager") @Scope(ScopeType.EVENT) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/SlideshowManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.Serializable; @@ -29,8 +29,8 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Events; -import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.service.Constants; @Name("slideshow") @Scope(ScopeType.CONVERSATION) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/TreeManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/TreeManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.Serializable; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/UserManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/manager/UserManager.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.manager; +package org.richfaces.photoalbum.manager; import java.io.File; import java.io.Serializable; @@ -31,9 +31,9 @@ import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; import org.jboss.seam.core.Events; -import org.richfaces.realworld.domain.User; -import org.richfaces.realworld.service.Constants; -import org.richfaces.realworld.service.IUserAction; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IUserAction; @Name("userManager") @Scope(ScopeType.EVENT) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/ISearchOption.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,11 +1,11 @@ /** * */ -package org.richfaces.realworld.search; +package org.richfaces.photoalbum.search; import java.util.List; -import org.richfaces.realworld.service.ISearchAction; +import org.richfaces.photoalbum.service.ISearchAction; /** * @author Andrey Markavtsov Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/ImageSearchHelper.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.search; +package org.richfaces.photoalbum.search; import java.io.Serializable; import java.util.ArrayList; @@ -12,9 +12,9 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.core.Events; -import org.richfaces.realworld.manager.NavigationEnum; -import org.richfaces.realworld.service.Constants; -import org.richfaces.realworld.service.ISearchAction; +import org.richfaces.photoalbum.manager.NavigationEnum; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.ISearchAction; @Name("searchImageHelper") @Scope(ScopeType.CONVERSATION) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByAlbum.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,12 +1,12 @@ -package org.richfaces.realworld.search; +package org.richfaces.photoalbum.search; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.richfaces.realworld.domain.Album; -import org.richfaces.realworld.service.ISearchAction; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.service.ISearchAction; public class SearchOptionByAlbum extends ISearchOption { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByImage.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,15 +1,15 @@ /** * */ -package org.richfaces.realworld.search; +package org.richfaces.photoalbum.search; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.service.ISearchAction; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.service.ISearchAction; /** * @author Andrey Markavtsov @@ -23,7 +23,7 @@ Map<String, Object> params = new HashMap<String, Object>(); /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getName() + * @see org.richfaces.photoalbum.search.ISearchOption#getName() */ public String getName() { return IMAGES; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByShelf.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByShelf.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,13 +1,13 @@ /** * */ -package org.richfaces.realworld.search; +package org.richfaces.photoalbum.search; import java.util.ArrayList; import java.util.List; -import org.richfaces.realworld.domain.Shelf; -import org.richfaces.realworld.service.ISearchAction; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.service.ISearchAction; /** * @author Andrey @@ -20,7 +20,7 @@ private static final String SHELVES = "Shelves"; /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getName() + * @see org.richfaces.photoalbum.search.ISearchOption#getName() */ @Override public String getName() { @@ -28,7 +28,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getSearchResultName() + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultName() */ @Override public String getSearchResultName() { @@ -36,7 +36,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getSearchResultTemplate() + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultTemplate() */ @Override public String getSearchResultTemplate() { @@ -44,7 +44,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#search(org.richfaces.realworld.service.ISearchAction, java.lang.String, boolean, boolean) + * @see org.richfaces.photoalbum.search.ISearchOption#search(org.richfaces.photoalbum.service.ISearchAction, java.lang.String, boolean, boolean) */ @Override public void search(ISearchAction action, String searchQuery, Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByTag.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,13 +1,13 @@ /** * */ -package org.richfaces.realworld.search; +package org.richfaces.photoalbum.search; import java.util.ArrayList; import java.util.List; -import org.richfaces.realworld.domain.MetaTag; -import org.richfaces.realworld.service.ISearchAction; +import org.richfaces.photoalbum.domain.MetaTag; +import org.richfaces.photoalbum.service.ISearchAction; /** * @author Andrey @@ -20,7 +20,7 @@ private static final String TAGS = "Tags"; /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getName() + * @see org.richfaces.photoalbum.search.ISearchOption#getName() */ @Override public String getName() { @@ -28,7 +28,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getSearchResultName() + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultName() */ @Override public String getSearchResultName() { @@ -36,7 +36,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getSearchResultTemplate() + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultTemplate() */ @Override public String getSearchResultTemplate() { @@ -44,7 +44,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#search(org.richfaces.realworld.service.ISearchAction, java.lang.String, boolean, boolean) + * @see org.richfaces.photoalbum.search.ISearchOption#search(org.richfaces.photoalbum.service.ISearchAction, java.lang.String, boolean, boolean) */ @Override public void search(ISearchAction action, String searchQuery, Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/search/SearchOptionByUser.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,13 +1,13 @@ /** * */ -package org.richfaces.realworld.search; +package org.richfaces.photoalbum.search; import java.util.ArrayList; import java.util.List; -import org.richfaces.realworld.domain.User; -import org.richfaces.realworld.service.ISearchAction; +import org.richfaces.photoalbum.domain.User; +import org.richfaces.photoalbum.service.ISearchAction; /** * @author Andrey Markavtsov @@ -20,7 +20,7 @@ private static final String USERS = "Users"; /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getName() + * @see org.richfaces.photoalbum.search.ISearchOption#getName() */ @Override public String getName() { @@ -28,7 +28,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getSearchResultName() + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultName() */ @Override public String getSearchResultName() { @@ -36,7 +36,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#getSearchResultTemplate() + * @see org.richfaces.photoalbum.search.ISearchOption#getSearchResultTemplate() */ @Override public String getSearchResultTemplate() { @@ -44,7 +44,7 @@ } /* (non-Javadoc) - * @see org.richfaces.realworld.search.ISearchOption#search(org.richfaces.realworld.service.ISearchAction) + * @see org.richfaces.photoalbum.search.ISearchOption#search(org.richfaces.photoalbum.service.ISearchAction) */ @Override public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ConfirmationPopupHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ConfirmationPopupHelper.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import java.io.Serializable; @@ -27,12 +27,12 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; 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.manager.AlbumManager; -import org.richfaces.realworld.manager.ImageManager; -import org.richfaces.realworld.manager.ShelfManager; +import org.richfaces.photoalbum.domain.Album; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.domain.Shelf; +import org.richfaces.photoalbum.manager.AlbumManager; +import org.richfaces.photoalbum.manager.ImageManager; +import org.richfaces.photoalbum.manager.ShelfManager; @Name("confirmationPopupHelper") @Scope(ScopeType.CONVERSATION) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/DirectLinkHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/DirectLinkHelper.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import java.io.IOException; import java.io.OutputStream; @@ -12,8 +12,8 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.security.Credentials; import org.jboss.seam.security.Identity; -import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.service.Constants; @Name("directLink") @Scope(ScopeType.EVENT) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/EditorBean.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/EditorBean.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/EditorBean.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,16 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.service.Constants; @Name("editorBean") public class EditorBean { - private String currentConfiguration = "/org/richfaces/realworld/editor/advanced"; + private String currentConfiguration = "/org/richfaces/photoalbum/editor/advanced"; private String message; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ErrorHandlerBean.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ErrorHandlerBean.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ErrorHandlerBean.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import java.util.ArrayList; import java.util.List; @@ -28,7 +28,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.service.Constants; @Name("errorHandlerBean") @Scope(ScopeType.EVENT) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/FileWrapper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/FileWrapper.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import java.io.Serializable; import java.util.ArrayList; @@ -29,8 +29,8 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; -import org.richfaces.realworld.domain.Image; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.domain.Image; +import org.richfaces.photoalbum.service.Constants; @Name("fileWrapper") @Scope(ScopeType.CONVERSATION) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/Help.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/Help.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/Help.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ImageLoader.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ImageLoader.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import java.io.File; import java.io.FileInputStream; @@ -31,8 +31,8 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.richfaces.realworld.manager.FileManager; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.manager.FileManager; +import org.richfaces.photoalbum.service.Constants; @Name("imageLoader") @Scope(ScopeType.EVENT) Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ImageSizeHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/ImageSizeHelper.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,13 +1,13 @@ /** * */ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.richfaces.realworld.service.Constants; -import org.richfaces.realworld.util.ImageDimension; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.util.ImageDimension; /** * @author Andrey Markavtsov Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/UserPrefsHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/ui/UserPrefsHelper.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,7 +1,7 @@ /** * */ -package org.richfaces.realworld.ui; +package org.richfaces.photoalbum.ui; import java.io.File; import java.io.Serializable; @@ -15,9 +15,9 @@ import org.jboss.seam.annotations.Scope; import org.richfaces.event.UploadEvent; import org.richfaces.model.UploadItem; -import org.richfaces.realworld.domain.Sex; -import org.richfaces.realworld.service.Constants; -import org.richfaces.realworld.service.IUserAction; +import org.richfaces.photoalbum.domain.Sex; +import org.richfaces.photoalbum.service.Constants; +import org.richfaces.photoalbum.service.IUserAction; /** * @author Andrey Markavtsov Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/ActionMapperTagHandler.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/ActionMapperTagHandler.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package org.richfaces.realworld.util; +package org.richfaces.photoalbum.util; import java.io.IOException; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/CopyImageStuff.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,7 +1,7 @@ /** * */ -package org.richfaces.realworld.util; +package org.richfaces.photoalbum.util; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Create; @@ -11,14 +11,13 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.contexts.ServletLifecycle; -import static org.richfaces.realworld.service.Constants.IMAGE_FOLDER; -import static org.richfaces.realworld.service.Constants.REALWORLD_FOLDER; -import static org.richfaces.realworld.service.Constants.TEMP_DIR; -import static org.richfaces.realworld.service.Constants.UPLOAD_FOLDER_PATH_ERROR; -import static org.richfaces.realworld.service.Constants.WEB_INF; -import static org.richfaces.realworld.util.FileUtils.copyDirectory; -import static org.richfaces.realworld.util.FileUtils.deleteDirectory; -import static org.richfaces.realworld.util.FileUtils.joinFiles; +import static org.richfaces.photoalbum.service.Constants.IMAGE_FOLDER; +import static org.richfaces.photoalbum.service.Constants.REALWORLD_FOLDER; +import static org.richfaces.photoalbum.service.Constants.TEMP_DIR; +import static org.richfaces.photoalbum.service.Constants.UPLOAD_FOLDER_PATH_ERROR; +import static org.richfaces.photoalbum.util.FileUtils.copyDirectory; +import static org.richfaces.photoalbum.util.FileUtils.deleteDirectory; +import static org.richfaces.photoalbum.util.FileUtils.joinFiles; import javax.servlet.ServletContext; import java.io.File; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/FileUtils.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileUtils.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/FileUtils.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.util; +package org.richfaces.photoalbum.util; import java.awt.Graphics2D; import java.awt.RenderingHints; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/ImageDimension.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageDimension.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/ImageDimension.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,6 +1,6 @@ -package org.richfaces.realworld.util; +package org.richfaces.photoalbum.util; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.service.Constants; public enum ImageDimension { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/SessionListener.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/SessionListener.java 2009-04-18 13:08:29 UTC (rev 13670) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/SessionListener.java 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,4 +1,4 @@ -package org.richfaces.realworld.util; +package org.richfaces.photoalbum.util; import javax.persistence.EntityManager; @@ -10,9 +10,7 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.core.Events; -import org.richfaces.realworld.domain.User; -import org.richfaces.realworld.service.Constants; +import org.richfaces.photoalbum.domain.User; @Scope(ScopeType.SESSION) @Name("sessionListener") Copied: trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/photoalbum.skin.properties (from rev 13670, trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/realworld.skin.properties) =================================================================== --- trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/photoalbum.skin.properties (rev 0) +++ trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/photoalbum.skin.properties 2009-04-20 08:37:38 UTC (rev 13672) @@ -0,0 +1,75 @@ +#Colors +headerBackgroundColor=#B34801 +headerGradientColor=#EA640A +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#D7D7D7 +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#F2F2F2 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#636363 +subBorderColor=#ffffff + +tabBackgroundColor=#FF6700 +tabDisabledTextColor=#E4B98F + +trimColor=#FFE2C6 + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#FF6700 +hoverLinkColor=#FFA800 +visitedLinkColor=#FF6700 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + + +tableBackgroundColor=#D7D7D7 +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 +tableBorderWidth=0px + + +#Calendar colors +calendarWeekBackgroundColor=#F5F5F5 + +calendarHolidaysBackgroundColor=#FFEBDA +calendarHolidaysTextColor=#FF7800 + +calendarCurrentBackgroundColor=#FF7800 +calendarCurrentTextColor=#FFEBDA + +calendarSpecBackgroundColor=#E4F5E2 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#D7D7D7 +editBackgroundColor=#FEFFDA + +#Gradients +gradientType=plain Property changes on: trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/photoalbum.skin.properties ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/realworld.skin.properties =================================================================== --- trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/realworld.skin.properties 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/web/src/main/resources/META-INF/skins/realworld.skin.properties 2009-04-20 08:37:38 UTC (rev 13672) @@ -1,75 +0,0 @@ -#Colors -headerBackgroundColor=#B34801 -headerGradientColor=#EA640A -headerTextColor=#FFFFFF -headerWeightFont=bold - -generalBackgroundColor=#D7D7D7 -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#F2F2F2 - -shadowBackgroundColor=#000000 -shadowOpacity=1 - -panelBorderColor=#636363 -subBorderColor=#ffffff - -tabBackgroundColor=#FF6700 -tabDisabledTextColor=#E4B98F - -trimColor=#FFE2C6 - -tipBackgroundColor=#FAE6B0 -tipBorderColor=#E5973E - -selectControlColor=#E79A00 - - -generalLinkColor=#FF6700 -hoverLinkColor=#FFA800 -visitedLinkColor=#FF6700 - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - - -tableBackgroundColor=#D7D7D7 -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#C0C0C0 -tableBorderWidth=0px - - -#Calendar colors -calendarWeekBackgroundColor=#F5F5F5 - -calendarHolidaysBackgroundColor=#FFEBDA -calendarHolidaysTextColor=#FF7800 - -calendarCurrentBackgroundColor=#FF7800 -calendarCurrentTextColor=#FFEBDA - -calendarSpecBackgroundColor=#E4F5E2 -calendarSpecTextColor=#000000 - - -warningColor=#FFE6E6 -warningBackgroundColor=#FF0000 - -editorBackgroundColor=#D7D7D7 -editBackgroundColor=#FEFFDA - -#Gradients -gradientType=plain Copied: trunk/test-applications/realworld2/web/src/main/resources/org/richfaces/photoalbum (from rev 13670, trunk/test-applications/realworld2/web/src/main/resources/org/richfaces/realworld) Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -10,6 +10,6 @@ </tag> <tag> <tag-name>actionMapper</tag-name> - <handler-class>org.richfaces.realworld.util.ActionMapperTagHandler</handler-class> + <handler-class>org.richfaces.photoalbum.util.ActionMapperTagHandler</handler-class> </tag> </facelet-taglib> \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-04-20 07:22:39 UTC (rev 13671) +++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-04-20 08:37:38 UTC (rev 13672) @@ -49,7 +49,7 @@ <context-param> <param-name>org.richfaces.SKIN</param-name> - <param-value>realworld</param-value> + <param-value>photoalbum</param-value> </context-param> <!-- Seam -->