JBoss Rich Faces SVN: r13672 - in trunk/test-applications/realworld2: ear and 22 other directories.
by richfaces-svn-commits@lists.jboss.org
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 -->
17 years
JBoss Rich Faces SVN: r13671 - in trunk/test-applications/jsp/src/main: webapp/DataScroller and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: adubovsky
Date: 2009-04-20 03:22:39 -0400 (Mon, 20 Apr 2009)
New Revision: 13671
Modified:
trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
Log:
+ lastPageMode test to dataScroller
Modified: trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2009-04-18 13:08:29 UTC (rev 13670)
+++ trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2009-04-20 07:22:39 UTC (rev 13671)
@@ -37,6 +37,7 @@
private Ordering sortOrder;
private String filterValue;
private String currentSortOrder;
+ private String lastPageMode;
public HtmlDatascroller getHtmlDatascroller(){
return htmlDatascroller;
@@ -141,6 +142,7 @@
selfSorted = true;
currentSortOrder = "ASCENDING";
dataTable = new ArrayList();
+ lastPageMode = "short";
for(int i=0;i<1000;i++)
{
@@ -220,6 +222,14 @@
this.align = align;
}
+ public String getLastPageMode() {
+ return lastPageMode;
+ }
+
+ public void setLastPageMode(String lastPageMode) {
+ this.lastPageMode = lastPageMode;
+ }
+
public boolean isLimitToList() {
return limitToList;
}
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2009-04-18 13:08:29 UTC (rev 13670)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2009-04-20 07:22:39 UTC (rev 13671)
@@ -37,7 +37,8 @@
onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
onmousedown="#{event.onmousedown}"
onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
- onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
+ lastPageMode="#{dataScroller.lastPageMode}">
</rich:datascroller>
</f:facet>
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2009-04-18 13:08:29 UTC (rev 13670)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2009-04-20 07:22:39 UTC (rev 13671)
@@ -11,6 +11,13 @@
value="RestoreArray" />
<h:panelGrid columns="2">
+ <h:outputText value="lastPageMode: " />
+ <h:selectOneRadio value="#{dataScroller.lastPageMode}">
+ <f:selectItem itemLabel="full" itemValue="full" />
+ <f:selectItem itemLabel="short" itemValue="short" />
+ <a4j:support event="onclick" reRender="dataTableId"></a4j:support>
+ </h:selectOneRadio>
+
<h:outputText value="maxPages" />
<h:inputText value="#{dataScroller.maxPages}">
<a4j:support event="onchange" reRender="dataTableId"></a4j:support>
17 years
JBoss Rich Faces SVN: r13670 - in trunk/cdk/maven-cdk-plugin/src/main: resources and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-18 09:08:29 -0400 (Sat, 18 Apr 2009)
New Revision: 13670
Added:
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/component/
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/css/
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/template/
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/themes/
trunk/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties
Modified:
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java
Log:
- add-theme goal added
- slight refactoring done
Added: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java (rev 0)
+++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCreateMojo.java 2009-04-18 13:08:29 UTC (rev 13670)
@@ -0,0 +1,141 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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.ajax4jsf.builder.mojo;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.aja4jsf.builder.model.Resource;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.velocity.VelocityContext;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public abstract class AbstractCreateMojo extends AbstractCDKMojo {
+
+ protected static final String SRC_MAIN_RESOURCES = "src/main/resources";
+
+ protected static final Set<String> JAVA_RESERVED_WORDS;
+
+ static{
+ JAVA_RESERVED_WORDS = new HashSet<String>();
+ JAVA_RESERVED_WORDS.add("abstract");
+ JAVA_RESERVED_WORDS.add("assert");
+ JAVA_RESERVED_WORDS.add("boolean");
+ JAVA_RESERVED_WORDS.add("break");
+ JAVA_RESERVED_WORDS.add("byte");
+ JAVA_RESERVED_WORDS.add("case");
+ JAVA_RESERVED_WORDS.add("catch");
+ JAVA_RESERVED_WORDS.add("char");
+ JAVA_RESERVED_WORDS.add("class");
+ JAVA_RESERVED_WORDS.add("const");
+ JAVA_RESERVED_WORDS.add("continue");
+ JAVA_RESERVED_WORDS.add("default");
+ JAVA_RESERVED_WORDS.add("do");
+ JAVA_RESERVED_WORDS.add("double");
+ JAVA_RESERVED_WORDS.add("else");
+ JAVA_RESERVED_WORDS.add("extends");
+ JAVA_RESERVED_WORDS.add("false");
+ JAVA_RESERVED_WORDS.add("final");
+ JAVA_RESERVED_WORDS.add("finally");
+ JAVA_RESERVED_WORDS.add("float");
+ JAVA_RESERVED_WORDS.add("for");
+ JAVA_RESERVED_WORDS.add("goto");
+ JAVA_RESERVED_WORDS.add("if");
+ JAVA_RESERVED_WORDS.add("implements");
+ JAVA_RESERVED_WORDS.add("import");
+ JAVA_RESERVED_WORDS.add("instanceof");
+ JAVA_RESERVED_WORDS.add("int");
+ JAVA_RESERVED_WORDS.add("interface");
+ JAVA_RESERVED_WORDS.add("long");
+ JAVA_RESERVED_WORDS.add("native");
+ JAVA_RESERVED_WORDS.add("new");
+ JAVA_RESERVED_WORDS.add("null");
+ JAVA_RESERVED_WORDS.add("package");
+ JAVA_RESERVED_WORDS.add("private");
+ JAVA_RESERVED_WORDS.add("protected");
+ JAVA_RESERVED_WORDS.add("public");
+ JAVA_RESERVED_WORDS.add("return");
+ JAVA_RESERVED_WORDS.add("short");
+ JAVA_RESERVED_WORDS.add("static");
+ JAVA_RESERVED_WORDS.add("strictfp");
+ JAVA_RESERVED_WORDS.add("super");
+ JAVA_RESERVED_WORDS.add("switch");
+ JAVA_RESERVED_WORDS.add("synchronized");
+ JAVA_RESERVED_WORDS.add("this");
+ JAVA_RESERVED_WORDS.add("throw");
+ JAVA_RESERVED_WORDS.add("throws");
+ JAVA_RESERVED_WORDS.add("transient");
+ JAVA_RESERVED_WORDS.add("true");
+ JAVA_RESERVED_WORDS.add("try");
+ JAVA_RESERVED_WORDS.add("void");
+ JAVA_RESERVED_WORDS.add("volatile");
+ JAVA_RESERVED_WORDS.add("while");
+ }
+
+ protected void checkAndCreateDirectory(File directory)
+ throws MojoExecutionException {
+ getLog().debug("Checking directory " + directory + " for existence");
+ if (!directory.exists()) {
+ directory.mkdirs();
+ getLog().debug("Directory " + directory + " created");
+ }
+ if (!directory.isDirectory()) {
+ throw new MojoExecutionException("Directory " + directory.getAbsolutePath() + " is not a Directory");
+ }
+ }
+
+ protected void filterJarResource(Resource template, Resource skinResource, File baseDir,
+ VelocityContext context) throws Exception {
+ File newFile = new File(baseDir, skinResource.getPath());
+ if (newFile.exists()) {
+ getLog().debug("File " + newFile + " already exists. Skipping.");
+ } else {
+ try {
+ writeParsedTemplate(template.getPath(), context, newFile);
+ } catch (Exception e) {
+ throw new MojoExecutionException("Unable to write file " + newFile, e);
+ }
+ }
+ }
+
+ protected boolean isValidJavaName(String name) {
+ return !JAVA_RESERVED_WORDS.contains(name);
+ }
+
+ protected boolean isValidPackageName(String packageName) {
+ if (packageName != null) {
+ String[] packageNameSegments = packageName.split("\\.");
+ for (String packageNameSegment : packageNameSegments) {
+ if (!isValidJavaName(packageNameSegment)) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+}
Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java 2009-04-17 23:04:12 UTC (rev 13669)
+++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java 2009-04-18 13:08:29 UTC (rev 13670)
@@ -29,9 +29,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -69,10 +67,8 @@
* @author Maksim Kaszynski
*
*/
-public class CreateSkinMojo extends AbstractCDKMojo {
+public class CreateSkinMojo extends AbstractCreateMojo {
- private static final String SRC_MAIN_RESOURCES = "src/main/resources";
-
private static final String PROPERTIES = ".skin.properties";
private static final String XCSS = ".xcss";
@@ -83,64 +79,6 @@
private static final String META_INF_SKINS = "META-INF/skins/";
- private static final Set<String> JAVA_RESERVED_WORDS;
-
- static{
- JAVA_RESERVED_WORDS = new HashSet<String>();
- JAVA_RESERVED_WORDS.add("abstract");
- JAVA_RESERVED_WORDS.add("assert");
- JAVA_RESERVED_WORDS.add("boolean");
- JAVA_RESERVED_WORDS.add("break");
- JAVA_RESERVED_WORDS.add("byte");
- JAVA_RESERVED_WORDS.add("case");
- JAVA_RESERVED_WORDS.add("catch");
- JAVA_RESERVED_WORDS.add("char");
- JAVA_RESERVED_WORDS.add("class");
- JAVA_RESERVED_WORDS.add("const");
- JAVA_RESERVED_WORDS.add("continue");
- JAVA_RESERVED_WORDS.add("default");
- JAVA_RESERVED_WORDS.add("do");
- JAVA_RESERVED_WORDS.add("double");
- JAVA_RESERVED_WORDS.add("else");
- JAVA_RESERVED_WORDS.add("extends");
- JAVA_RESERVED_WORDS.add("false");
- JAVA_RESERVED_WORDS.add("final");
- JAVA_RESERVED_WORDS.add("finally");
- JAVA_RESERVED_WORDS.add("float");
- JAVA_RESERVED_WORDS.add("for");
- JAVA_RESERVED_WORDS.add("goto");
- JAVA_RESERVED_WORDS.add("if");
- JAVA_RESERVED_WORDS.add("implements");
- JAVA_RESERVED_WORDS.add("import");
- JAVA_RESERVED_WORDS.add("instanceof");
- JAVA_RESERVED_WORDS.add("int");
- JAVA_RESERVED_WORDS.add("interface");
- JAVA_RESERVED_WORDS.add("long");
- JAVA_RESERVED_WORDS.add("native");
- JAVA_RESERVED_WORDS.add("new");
- JAVA_RESERVED_WORDS.add("null");
- JAVA_RESERVED_WORDS.add("package");
- JAVA_RESERVED_WORDS.add("private");
- JAVA_RESERVED_WORDS.add("protected");
- JAVA_RESERVED_WORDS.add("public");
- JAVA_RESERVED_WORDS.add("return");
- JAVA_RESERVED_WORDS.add("short");
- JAVA_RESERVED_WORDS.add("static");
- JAVA_RESERVED_WORDS.add("strictfp");
- JAVA_RESERVED_WORDS.add("super");
- JAVA_RESERVED_WORDS.add("switch");
- JAVA_RESERVED_WORDS.add("synchronized");
- JAVA_RESERVED_WORDS.add("this");
- JAVA_RESERVED_WORDS.add("throw");
- JAVA_RESERVED_WORDS.add("throws");
- JAVA_RESERVED_WORDS.add("transient");
- JAVA_RESERVED_WORDS.add("true");
- JAVA_RESERVED_WORDS.add("try");
- JAVA_RESERVED_WORDS.add("void");
- JAVA_RESERVED_WORDS.add("volatile");
- JAVA_RESERVED_WORDS.add("while");
- }
-
/**
* Name of base package of skin.
* If it is not set, GroupId is used.
@@ -221,13 +159,14 @@
getLog().debug("Skin package is " + fullSkinName);
//RF-4023
- if(JAVA_RESERVED_WORDS.contains(skinName)){
+ if (!isValidJavaName(skinName)){
throw new MojoExecutionException("Invalid skin name '" + skinName + "'. Please type another name.");
}
- if(JAVA_RESERVED_WORDS.contains(packageName)){
+
+ if (!isValidPackageName(packageName)) {
throw new MojoExecutionException("Invalid skin package '" + packageName + "'. Please type another package.");
}
-
+
SkinInfo skinInfoTemplate = new SkinInfo();
skinInfoTemplate.setShortName(shortName);
skinInfoTemplate.setPackageName(fullSkinName.toLowerCase());
@@ -272,19 +211,6 @@
}
}
- private void filterJarResource(Resource template, Resource skinResource, File baseDir, VelocityContext context) throws Exception{
- File newFile = new File(baseDir, skinResource.getPath());
- if (newFile.exists()) {
- getLog().debug("File " + newFile + " already exists. Skipping.");
- } else {
- try {
- writeParsedTemplate(template.getPath(), context, newFile);
- } catch (Exception e) {
- throw new MojoExecutionException("Unable to write file " + newFile, e);
- }
- }
- }
-
private List<Resource> filterComponentSkinTemplates(List<Resource> jarTemplates, SkinInfo skinInfo, File resourceDir) throws MojoExecutionException {
List<Resource> newResources = new ArrayList<Resource>(jarTemplates.size());
for (Resource jarTemplate : jarTemplates) {
@@ -484,17 +410,6 @@
return pluginArtifact.getFile();
}
- private void checkAndCreateDirectory(File directory) throws MojoExecutionException {
- getLog().debug("Checking directory " + directory + " for existence");
- if (!directory.exists()) {
- directory.mkdirs();
- getLog().debug("Directory " + directory + " created");
- }
- if (!directory.isDirectory()) {
- throw new MojoExecutionException("Directory " + directory.getAbsolutePath() + " is not a Directory");
- }
- }
-
private void addToResourceConfig(List<Resource> resources, File resourceConfigFile) throws Exception{
ResourceConfig resourceConfig = null;
Added: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java (rev 0)
+++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateThemeMojo.java 2009-04-18 13:08:29 UTC (rev 13670)
@@ -0,0 +1,158 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 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.ajax4jsf.builder.mojo;
+
+import java.io.File;
+import java.util.Locale;
+
+import org.aja4jsf.builder.model.Resource;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.velocity.VelocityContext;
+
+/**
+ * This mojo is intended to create new theme within existing project.
+ * <p><b>Usage</b> <tt>mvn cdk:add-theme -Dname=<themeName> [ -Dpackage=<themePackage> ]</tt></p>
+ * This adds new theme named <themeName> to project resources/META-INF/themes folder.<br/>
+ * If <em>package</em> is not specified, it is set same as groupId.<br/>
+ *
+ * Following parameters can be used
+ * <li><strong>name</strong> - name of the theme. <strong>Required.</strong></li>
+ * <li><strong>package</strong> - base package of the theme. If not specified, <em>groupId</em> is used</li>
+ *
+ * @goal add-theme
+ * @requiresProject true
+ *
+ * @author Nick Belaevski
+ */
+public class CreateThemeMojo extends AbstractCreateMojo {
+
+ private static final String XCSS = ".xcss";
+
+ private static final String META_INF_THEMES = "META-INF/themes/";
+
+ private static final String XCSS_THEMES_PACKAGE = "/renderkit/html/css";
+
+ private static final String THEME_PROPERTIES = ".theme.properties";
+
+ private static final String RENDERKIT_THEMES = "renderkit.html";
+
+ /**
+ * Name of base package of theme.
+ * If it is not set, GroupId is used.
+ * @parameter expression="${package}" default-value="${project.groupId}"
+ */
+ private String packageName;
+
+
+ /**
+ * Name of theme. Required parameter.
+ * @parameter expression="${name}"
+ * @required
+ */
+ private String themeName;
+
+ private String generateRendererName(String themeName) {
+ StringBuilder rendererTypeBuilder = new StringBuilder();
+ rendererTypeBuilder.append(Character.toUpperCase(themeName.charAt(0)));
+ rendererTypeBuilder.append(themeName.subSequence(1, themeName.length()));
+ rendererTypeBuilder.append("Renderer");
+ return rendererTypeBuilder.toString();
+ }
+
+ private void generateTheme(String packageName, String themeName) throws MojoExecutionException, MojoFailureException {
+ Resource themeProperties = new Resource("theme/themes/theme.properties");
+ Resource themeXCSS = new Resource("theme/css/theme.xcss");
+ Resource themeConfig = new Resource("theme/component/theme.xml");
+ Resource themeTemplate = new Resource("theme/template/theme.jspx");
+
+ File resourceDir = new File(project.getBasedir(), SRC_MAIN_RESOURCES);
+
+ String packagePath = packageName.replace('.', '/');
+ String xcssPackagePath = packagePath + XCSS_THEMES_PACKAGE;
+ String rendererName = generateRendererName(themeName);
+ String rendererType = packageName + '.' + rendererName;
+ String rendererClassName = packageName + '.' + RENDERKIT_THEMES + '.' + rendererName;
+
+ getLog().debug("Relative path to package is " + packagePath);
+
+ VelocityContext velocityMasterContext = new VelocityContext();
+ velocityMasterContext.put("packagePath", packagePath);
+ velocityMasterContext.put("xcssPackagePath", xcssPackagePath);
+ velocityMasterContext.put("name", themeName);
+ velocityMasterContext.put("rendererType", rendererType);
+ velocityMasterContext.put("rendererClassName", rendererClassName);
+
+ Resource properties = new Resource(META_INF_THEMES + themeName + THEME_PROPERTIES);
+ try {
+ filterJarResource(themeProperties, properties, resourceDir, velocityMasterContext);
+ } catch (Exception e) {
+ throw new MojoExecutionException("An exception occured while filtering resource " + themeProperties + " into " + properties, e);
+ }
+
+ Resource xcss = new Resource(xcssPackagePath + '/' + themeName + XCSS);
+ try {
+ filterJarResource(themeXCSS, xcss, resourceDir, velocityMasterContext);
+ } catch (Exception e) {
+ throw new MojoExecutionException("An exception occured while filtering resource " + themeXCSS + " into " + xcss, e);
+ }
+
+ File configDir = new File(project.getBasedir(), "src/main/config/component");
+ Resource config = new Resource(themeName + ".xml");
+ try {
+ filterJarResource(themeConfig, config, configDir, velocityMasterContext);
+ } catch (Exception e) {
+ throw new MojoExecutionException("An exception occured while filtering resource " + themeConfig + " into " + config, e);
+ }
+
+ File templateDir = new File(project.getBasedir(), "src/main/templates");
+ Resource template = new Resource(packagePath + '/' + themeName + ".jspx");
+ try {
+ filterJarResource(themeTemplate, template, templateDir, velocityMasterContext);
+ } catch (Exception e) {
+ throw new MojoExecutionException("An exception occured while filtering resource " + themeTemplate + " into " + template, e);
+ }
+ }
+
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ getLog().info("Executing " + project);
+ getLog().info("Generating Theme " + themeName);
+
+ String themePackageName = packageName.replace('/', '.').toLowerCase(Locale.US);
+ String shortName = themeName;
+ getLog().debug("Root package " + packageName);
+ getLog().debug("Theme package is " + themePackageName);
+
+ if (!isValidJavaName(themeName)){
+ throw new MojoExecutionException("Invalid theme name '" + themeName + "'. Please type another name.");
+ }
+
+ if (!isValidPackageName(packageName)) {
+ throw new MojoExecutionException("Invalid theme package '" + packageName + "'. Please type another package.");
+ }
+
+ generateTheme(themePackageName, shortName);
+
+ getLog().info("Generating Theme successful");
+ }
+
+}
Added: trunk/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml (rev 0)
+++ trunk/cdk/maven-cdk-plugin/src/main/resources/theme/component/theme.xml 2009-04-18 13:08:29 UTC (rev 13670)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd">
+
+<components>
+ <renderer generate="true" override="true">
+ <name>${rendererType}</name>
+ <family>org.richfaces.Page</family>
+ <template>${packagePath}/${name}.jspx</template>
+ </renderer>
+</components>
\ No newline at end of file
Added: trunk/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss (rev 0)
+++ trunk/cdk/maven-cdk-plugin/src/main/resources/theme/css/theme.xcss 2009-04-18 13:08:29 UTC (rev 13670)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:template xmlns:f='http:/jsf.exadel.com/template'
+ xmlns:u='http:/jsf.exadel.com/template/util'
+ xmlns="http://www.w3.org/1999/xhtml">
+
+ <u:selector name=".rich-page">
+ </u:selector>
+
+ <u:selector name=".rich-page-header">
+ </u:selector>
+
+ <u:selector name=".rich-page-footer">
+ </u:selector>
+
+ <u:selector name=".rich-page-sidebar">
+ </u:selector>
+
+ <u:selector name=".rich-page-body">
+ </u:selector>
+
+ <f:verbatim>
+ <![CDATA[
+ .rich-page-sidebar {
+ float: left;
+ margin-bottom: 15px;
+ margin-right: 15px;
+ }
+ ]]>
+ </f:verbatim>
+</f:template>
\ No newline at end of file
Added: trunk/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx (rev 0)
+++ trunk/cdk/maven-cdk-plugin/src/main/resources/theme/template/theme.jspx 2009-04-18 13:08:29 UTC (rev 13670)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c=" http://java.sun.com/jsf/core"
+ xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+ xmlns:u=" http://ajax4jsf.org/cdk/u"
+ xmlns:x=" http://ajax4jsf.org/cdk/x"
+ xmlns:h="http://jsf.exadel.com/header"
+ xmlns:vcp="http://ajax4jsf.org/cdk/vcp" class="${rendererClassName}"
+ baseclass="org.richfaces.renderkit.AbstractPageRenderer"
+ component="org.richfaces.component.UIPage">
+
+ <c:set var="namespace" value="#{this:prolog(context,component)}" />
+ <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}">
+ <head>
+ <title>#{component.attributes['pageTitle']}</title>
+ <f:call name="themeStyle" />
+ <f:call name="themeScript" />
+ <style type="text/css">
+ <jsp:scriptlet><![CDATA[
+ Integer width = (Integer) component.getAttributes().get("width");
+
+ if (null != width && width.intValue() > 0) {
+ StringBuilder format = new StringBuilder(".rich-page{margin:auto;text-align:left;");
+ format.append("width:").append(width).append("px;");
+ writer.write(format.toString());
+ } else {
+ writer.write(".rich-page{width: 100%;}\n");
+ }]]></jsp:scriptlet>
+ </style>
+
+ <u:insertFacet name="pageHeader" />
+ </head>
+ <body x:passThruWithExclusions="value,name,type,id" class="rich-page">
+
+ <div class="rich-page-header">
+ <u:insertFacet name="header" />
+ </div>
+
+ <div class="rich-page-sidebar">
+ <u:insertFacet name="sidebar" />
+ </div>
+
+ <div>
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
+ </div>
+
+ <div class="rich-page-footer">
+ <u:insertFacet name="footer" />
+ </div>
+
+ </body>
+ </html>
+</f:root>
\ No newline at end of file
Added: trunk/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties (rev 0)
+++ trunk/cdk/maven-cdk-plugin/src/main/resources/theme/themes/theme.properties 2009-04-18 13:08:29 UTC (rev 13670)
@@ -0,0 +1,2 @@
+rendererType=${rendererType}
+styleSheet=resource\:///${xcssPackagePath}/${name}.xcss
17 years
JBoss Rich Faces SVN: r13669 - in trunk/docs/realworld_app_guide/en/src/main/docbook: modules and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: smukhina
Date: 2009-04-17 19:04:12 -0400 (Fri, 17 Apr 2009)
New Revision: 13669
Modified:
trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/how_it_works.xml
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml
Log:
https://jira.jboss.org/jira/browse/rf-5768 English is corrected
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml 2009-04-17 22:58:53 UTC (rev 13668)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/master.xml 2009-04-17 23:04:12 UTC (rev 13669)
@@ -32,7 +32,7 @@
</bookinfo>
<toc/>
&intro;
- &application_overview;
+ &application_overview;
&getting_started;
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-04-17 22:58:53 UTC (rev 13668)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/application_overview.xml 2009-04-17 23:04:12 UTC (rev 13669)
@@ -12,7 +12,7 @@
<section><title>Used technologies</title>
<para>
- The Photo Album Demo application is not only a JSF application. It encompasses various technologies and frameworks:
+ The Photo Album Demo application is not only a JSF application. It encompasses various technologies and frameworks:
</para>
<itemizedlist>
<listitem><para><emphasis>Java Server Faces (JSF)</emphasis>, technology that provides a single, standard, efficient way to use Java technologies to build Web-based applications;</para></listitem>
@@ -29,8 +29,8 @@
<title>General overview</title>
<para>
While designing the <property>Photo Album Demo</property>, one of the goal was to create a well-structured and transparent system, which will provide a photo-album-like functionality on one hand and demonstrate the main benefits of the <property>RichFaces</property> on the other.
- Thinking within the bounds of the <property>RichFaces</property> library only we could get an application flooded with modal panels, toggles and other controls where they are necessary and where not.
- Developing just a photo album could cause missing the goal of demonstraiting the components.
+ Thinking within the bounds of the <property>RichFaces</property> library only we could get is an application flooded with modal panels, toggles and other controls where they are necessary and where are not.
+ Developing just a photo album could cause missing the goal to demonstrate the components functionality.
That’s why the development of the application was started with brewing of Rich component use cases. Some smart cases of using the components were found.
</para>
<para>
@@ -38,13 +38,13 @@
<ulink url="https://anonsvn.jboss.org/repos/richfaces/management/design/realWorldDemo...">https://anonsvn.jboss.org/repos/richfaces/management/design/realWorldDemo...</ulink>
</para>
<para>
- In order to document key concepts and conceptual representation of data of the <property>Photo Album Demo</property> application the Entity Relation diagram (ERD) was created.
+ In order to document key concepts and conceptual representation of data of the <property>Photo Album Demo</property> application the Entity Relation Diagram (ERD) is created.
The diagram also identifies the relationships among all major entities within the system and their significant methods and attributes.
It provides a structural view of the system that can be complemented by other dynamic views in use case models.
</para>
<figure>
- <title>Thе Photo Album Demo entity relation diagram</title>
+ <title>Thе Photo Album Demo Entity Relation Diagram</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/erd.png"/>
@@ -53,9 +53,9 @@
</figure>
<para>
- An important benefit of a entity relation diagram is that it describes and constrains the system scope.
+ An important benefit of an entity relation diagram is that it describes and constrains the system scope.
It is also used to verify and validate the understanding of the problems among various stakeholders of a project group.
- It is especially helpful as a communication tool and a focusing point between technical and business teams.
+ It is especially useful as a communication tool and a focusing point between technical and business teams.
</para>
<para>
@@ -68,20 +68,20 @@
The following steps describe how to use this archetype:
</para>
<itemizedlist>
- <listitem><para>create a new project directory on your hard disk;</para></listitem>
- <listitem><para>browse to the directory with the archetype (<code>richfaces\cdk\maven-archetype-seam-app</code>), switch to command line and type the next command <code>mvn install</code> to install the archetype in your repository;</para></listitem>
- <listitem><para>then browse to your project directory and type in command line</para>
+ <listitem><para>Create a new project directory on your hard disk;</para></listitem>
+ <listitem><para>Browse to the directory with the archetype (<code>richfaces\cdk\maven-archetype-seam-app</code>), switch to command line and type the next command <code>mvn install</code> to install the archetype in your repository;</para></listitem>
+ <listitem><para>Then browse to your project directory and type in command line</para>
<para><code>mvn archetype:generate </code></para>
<para><code>-DarchetypeGroupId=org.richfaces.cdk </code></para>
<para><code>-DarchetypeArtifactId=maven-archetype-seam-app </code></para>
<para><code>-DarchetypeVersion=3.3.0-SNAPSHOT </code></para>
<para><code>-DgroupId=[Your_project_group_id] </code></para>
<para><code>-DartifactId=[Your_project_name] </code></para>
- <para>some project preferences such as <property>RichFaces</property> components version or Jboss server version and others could be customized in root <code>.pom</code> file </para>
+ <para>Some project preferences such as <property>RichFaces</property> components version or Jboss server version and others could be customized in the root <code>.pom</code> file </para>
</listitem>
- <listitem><para>type <code>mvn install</code>;</para></listitem>
- <listitem><para>type <code>mvn eclipse:eclipse</code> to generate eclipse project </para></listitem>
- <listitem><para>import projects into your IDE.</para></listitem>
+ <listitem><para>Type <code>mvn install</code>;</para></listitem>
+ <listitem><para>Type <code>mvn eclipse:eclipse</code> to generate eclipse project </para></listitem>
+ <listitem><para>Import projects into your IDE.</para></listitem>
</itemizedlist>
<para>
@@ -103,7 +103,7 @@
The loader repository is a specific feature of JBoss projects architecture.
It's used to prevent classes of one application being used by classes of another application when two or more applications running on the same server.
Jboss class loading uses the concept of a class loader repository.
- It needs a little getting used to, so some it features should be touched here:
+ It needs a little getting used to, so some its features should be described here:
</para>
<itemizedlist>
@@ -112,7 +112,7 @@
<listitem><para>These class loaders at first ask the repository and then load their own classes;</para></listitem>
<listitem><para>They may also decide to become the head of a new loader repository;</para></listitem>
<listitem><para>Classes loaded into child loader repositories are not visible to parent loader repositories;</para></listitem>
- <listitem><para>The order in which the class loaders are added to the repository matters.</para></listitem>
+ <listitem><para>The order in which the class loaders are added to the repository matters.</para></listitem>
</itemizedlist>
<para>
@@ -129,7 +129,7 @@
</figure>
<para>
- The WEB module structure contains <code>.xhtml</code> sources looks similar to a usual JSF application. The structure of WEB module is illustrated below:
+ The WEB module structure contains <code>.xhtml</code> sources that looks similar to a usual JSF application. The structure of WEB module is illustrated below:
</para>
<figure>
@@ -143,7 +143,7 @@
<para>Since the Photo Album Demo uses Facelets technology the main page <code>index.xhtml</code> represents an <include> (or facelet) wrapped with the <emphasis role="bold"><ui:composition></emphasis> tag.
This tag is used to trim unnecessary markup in the facelet.
- Any content outside of <emphasis role="bold"><ui:composition></emphasis> tag will be ignored by the Facelets view handler.
+ Any content outside of <emphasis role="bold"><ui:composition></emphasis> tag is ignored by the Facelets view handler.
A facelet can be incorporated into another page or facelet with the help of <emphasis role="bold"><ui:define></emphasis> and <emphasis role="bold"><ui:include></emphasis> tags pointed to by the <emphasis role="bold"><ui:include></emphasis> "src" attribute.
The facelet may simply contain a fragment of XHTML or XML to be included.</para>
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml 2009-04-17 22:58:53 UTC (rev 13668)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml 2009-04-17 23:04:12 UTC (rev 13669)
@@ -10,7 +10,7 @@
<title>Getting started</title>
<section>
- <title>Environment configuration</title>
+ <title>Environment Configuration</title>
<para>
The working version of the application is available on-line at <ulink url="http://livedemo.exadel.com/realworld/">http://livedemo.exadel.com/realworld/</ulink>.
</para>
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/how_it_works.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/how_it_works.xml 2009-04-17 22:58:53 UTC (rev 13668)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/how_it_works.xml 2009-04-17 23:04:12 UTC (rev 13669)
@@ -9,9 +9,9 @@
</chapterinfo>
<title>How it works</title>
- <section><title>General application overview</title>
- <section><title>Used technologies overview</title>
- <para>The PhotoAlbum is based on following technologies and frameworks:</para>
+ <section><title>Application Overview</title>
+ <section><title>Used Technologies</title>
+ <para>The Photo Album is based on the following technologies and frameworks:</para>
<itemizedlist>
<listitem><para>Java Server Faces (JSF), technology that provides a single, standard, productive way to use Java technologies to build Web-based applications;</para></listitem>
<listitem><para>Facelets, the technology that combines the power of UI components and the flexibility of XML to accelerate JavaServer Faces development. Facelets presents a compelling alternative to JSP as the markup technology of choice for next-generation JSF applications;</para></listitem>
@@ -23,8 +23,8 @@
</section>
<section>
- <title>The main benefits of the RichFaces</title>
- <para>The RichFaces has set of benefits positioning this library and framework with a difference to the wide range of similar libraries.
+ <title>Benefits of RichFaces</title>
+ <para>The RichFaces has a set of benefits distinguishing this library and framework from a wide range of similar libraries.
All the RichFaces benefits are fully described in the <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">Introduction to the RichFaces</ulink>.
The <Photo Album> covers some of the most important of them and demonstrates: </para>
<itemizedlist>
@@ -40,7 +40,7 @@
<para>Since the application uses Facelets technology the main page <code>index.xhtml</code> represents an <include> (or facelet) wrapped with the <emphasis role="bold"><ui:composition></emphasis> tag.
This tag is used to trim unnecessary markup in the facelet. Any content outside of <emphasis role="bold"><ui:composition></emphasis> tag will be ignored by the Facelets view handler.
A facelet can be incorporated into another page or facelet with the help of <emphasis role="bold"><ui:define></emphasis> and <emphasis role="bold"><ui:include></emphasis> tags pointed to by the <emphasis role="bold"><ui:include></emphasis> "src" attribute.
- The facelet may simply contain a fragment of XHTML or XML to be included.</para>
+ The facelet may simply contains a fragment of XHTML or XML to be included.</para>
<para>Here is <code>index.xhtml</code> page source code:</para>
<programlisting role="XML"><![CDATA[<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml 2009-04-17 22:58:53 UTC (rev 13668)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/intro.xml 2009-04-17 23:04:12 UTC (rev 13669)
@@ -4,7 +4,7 @@
<title>Introduction</title>
<para>
- The <emphasis>RichFaces Real World Demo Application</emphasis> — "<emphasis role="bold">Photo Album Demo</emphasis>" —
+ The Photo Album Demo
is created to help you imagine the way web applications designed and developed with <property>RichFaces</property> can look like and behave.
</para>
<para>
@@ -19,9 +19,9 @@
The "<emphasis role="bold">Photo Album Demo</emphasis>" covers some of the main ones and demonstrates:
</para>
<itemizedlist>
- <listitem><para><emphasis>wide variety of UI components</emphasis> — the <property>RichFaces</property> provides a Lego-like way of building user interfaces for web applications;</para></listitem>
- <listitem><para><emphasis>built-in Ajax capability</emphasis> — the <property>RichFaces</property> offers both component-wide and very flexible page-wide Ajax support with no need to write any JavaScript code; </para></listitem>
- <listitem><para><emphasis>highly customizable look-and-feel</emphasis> — the <property>RichFaces</property> have special feature called
+ <listitem><para><emphasis>Wide variety of UI components</emphasis> — the <property>RichFaces</property> provides a Lego-like way of building user interfaces for web applications;</para></listitem>
+ <listitem><para><emphasis>Built-in Ajax capability</emphasis> — the <property>RichFaces</property> offers both component-wide and very flexible page-wide Ajax support with no need to write any JavaScript code; </para></listitem>
+ <listitem><para><emphasis>Highly customizable look-and-feel</emphasis> — the <property>RichFaces</property> have special feature called
"<ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/...">Skinnability</ulink>").</para></listitem>
</itemizedlist>
<para>
@@ -30,7 +30,7 @@
Newcomers or not registered users can navigate through other users shelves and albums in "Anonymous mode", but in this case <property>no</property> possibilities to create personal shelves or albums or upload photos are available.
</para>
<para>
- The "Photo Album Demo" represents and implements strict "Shelves—Albums—Photos" paradigm.
+ The "Photo Album Demo" represents and implements strict "Shelves—Albums—Photos" hierarchy.
It means that photos are kept in albums and albums are stored on shelves, but albums can not contain another albums or shelves and shelves can not keep another shelves and can not be stored in albums.
</para>
<para>
17 years, 1 month
JBoss Rich Faces SVN: r13668 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar: examples and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-17 18:58:53 -0400 (Fri, 17 Apr 2009)
New Revision: 13668
Added:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/clientFunctions.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/functions.xhtml
Log:
calendar sample of client side styling disablement added.(TDB description)
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/clientFunctions.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/clientFunctions.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/clientFunctions.xhtml 2009-04-17 22:58:53 UTC (rev 13668)
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+<ui:composition template="/templates/component-sample.xhtml">
+ <ui:define name="sample">
+ <p>
+ This simple example shows the way of dates disablement and styling without dataModel usage.
+ </p>
+ <fieldset class="demo_fieldset">
+ <legend class="demo_legend">Calendar Demo</legend>
+ <div class="sample-container" >
+ <ui:include src="/richfaces/calendar/examples/functions.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="openlabel" value="View Source" />
+ <ui:param name="sourcepath" value="/richfaces/calendar/examples/functions.xhtml"/>
+ </ui:include>
+ </div>
+ </fieldset>
+ </ui:define>
+
+</ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/functions.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/functions.xhtml (rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/functions.xhtml 2009-04-17 22:58:53 UTC (rev 13668)
@@ -0,0 +1,36 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+ <style>
+ .everyThirdDay{
+ background-color:gray;
+
+ }
+ .weekendBold{
+ font-weight:bold;
+ }
+
+ </style>
+ <script type="text/javascript">
+ var curDt = new Date();
+ function disablementFunction(day){
+ if (day.isWeekend) return false;
+ if (curDt==undefined){
+ curDt = day.date.getDate;
+ }
+ if (curDt.getTime() - day.date.getTime() < 0) return true; else return false;
+ }
+ function disabledClassesProv(day){
+ if (curDt.getTime() - day.date.getTime() >= 0) return 'rich-calendar-boundary-dates';
+ var res = '';
+ if (day.isWeekend) res+='weekendBold ';
+ if (day.day%3==0) res+='everyThirdDay';
+ return res;
+ }
+ </script>
+ <rich:calendar isDayEnabled="disablementFunction" dayStyleClass="disabledClassesProv" boundaryDatesMode="scroll"/>
+
+</ui:composition>
\ No newline at end of file
17 years, 1 month
JBoss Rich Faces SVN: r13667 - in trunk/samples/richfaces-demo/src/main: webapp/richfaces and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-17 18:50:41 -0400 (Fri, 17 Apr 2009)
New Revision: 13667
Modified:
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml
Log:
calendar sample of client side styling disablement added.(TDB description)
Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2009-04-17 21:25:54 UTC (rev 13666)
+++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2009-04-17 22:50:41 UTC (rev 13667)
@@ -34,7 +34,7 @@
menuGroup= richMenu, Menu Group, /images/ico_MenuGroup.gif, /images/cn_MenuGroup.gif, menuGroup.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuGroup.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuGroup.html, /richfaces/dropDownMenu.jsf
menuItem= richMenu, Menu Item, /images/ico_MenuItem.gif, /images/cn_MenuItem.gif, menuItem.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuItem.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuItem.html, /richfaces/dropDownMenu.jsf
menuSeparator= richMenu, Menu Separator, /images/ico_MenuSeparator.gif, /images/cn_MenuSeparator.gif, menuSeparator.html, jbossrichfaces/freezone/docs/tlddoc/rich/menuSeparator.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMenuSeparator.html, /richfaces/dropDownMenu.jsf
-calendar= richInputs, Calendar, /images/ico_Calendar.gif, /images/cn_Calendar.gif, calendar.html, jbossrichfaces/freezone/docs/tlddoc/rich/calendar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UICalendar.html, /richfaces/calendar.jsf
+calendar= richInputs, Calendar, /images/ico_Calendar.gif, /images/cn_Calendar.gif, calendar.html, jbossrichfaces/freezone/docs/tlddoc/rich/calendar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UICalendar.html, /richfaces/calendar.jsf, new
message= richMisc, Message, /images/ico_common.gif, /images/cn_Message.gif, message.html, jbossrichfaces/freezone/docs/tlddoc/rich/message.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRichMessage.html, /richfaces/message.jsf
messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, messages.html, jbossrichfaces/freezone/docs/tlddoc/rich/messages.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRichMessages.html, /richfaces/messages.jsf
virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, virtualEarth.html, jbossrichfaces/freezone/docs/tlddoc/rich/virtualEarth.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIVirtualEarth.html, /richfaces/virtualEarth.jsf
@@ -92,4 +92,4 @@
editor=richInputs, Editor, /images/ico_Editor.gif, /images/cn_Editor.gif, editor.html, jbossrichfaces/freezone/docs/tlddoc/rich/editor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEditor.html, /richfaces/editor.jsf
queue=ajaxSupport, Queue, /images/ico_common.gif, /images/cn_Queue.gif, Queue.html, jbossrichfaces/freezone/docs/tlddoc/rich/queue.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIQueue.html, /richfaces/queue.jsf
colorPicker= richInputs, Color Picker, /images/ico_ColorPicker.gif, /images/cn_ColorPicker.gif, ColorPicker.html, jbossrichfaces/freezone/docs/tlddoc/rich/colorPicker.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIColorPicker.html, /richfaces/colorPicker.jsf, new
-layouts= richMisc, Layouts, /images/ico_Layouts.gif, /images/cn_Layouts.gif, Layouts.html, jbossrichfaces/freezone/docs/tlddoc/rich/Page.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPage.html, /richfaces/layouts.jsf, new
\ No newline at end of file
+layouts=richMisc, Layouts, /images/ico_Layouts.gif, /images/cn_Layouts.gif, Layouts.html, jbossrichfaces/freezone/docs/tlddoc/rich/Page.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPage.html, /richfaces/layouts.jsf, new
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml 2009-04-17 21:25:54 UTC (rev 13666)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml 2009-04-17 22:50:41 UTC (rev 13667)
@@ -16,6 +16,9 @@
<rich:tab name="organizer" label="Organizer Creation">
<ui:include src="/richfaces/calendar/organizer.xhtml" />
</rich:tab>
+ <rich:tab name="clientSideCustomization" label="Client Side Disable/Styling">
+ <ui:include src="/richfaces/calendar/clientFunctions.xhtml" />
+ </rich:tab>
<rich:tab name="model" label="Calendar Model">
<ui:include src="/richfaces/calendar/model.xhtml" />
</rich:tab>
17 years, 1 month
JBoss Rich Faces SVN: r13666 - trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-17 17:25:54 -0400 (Fri, 17 Apr 2009)
New Revision: 13666
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
Log:
https://jira.jboss.org/jira/browse/RF-6861
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2009-04-17 21:18:57 UTC (rev 13665)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2009-04-17 21:25:54 UTC (rev 13666)
@@ -39,6 +39,8 @@
private int scrollerPage;
+ private ArrayList<DemoInventoryItem[]> model = null;
+
private ArrayList<DemoInventoryItem> selectedCars = new ArrayList<DemoInventoryItem>();
private ArrayList<Facet> columns = new ArrayList<Facet>();
private static int DECIMALS = 1;
@@ -241,17 +243,18 @@
}
public ArrayList<DemoInventoryItem[]> getModel() {
-
- ArrayList<DemoInventoryItem[]> model = new ArrayList<DemoInventoryItem[]>();
- for (int i = 0; i < 9; i++) {
- DemoInventoryItem[] items = new DemoInventoryItem[6];
- items[0]=createCar("Chevrolet","Corvette", 1).get(0);
- items[1]=createCar("Ford","Explorer", 1).get(0);
- items[2]=createCar("Nissan","Maxima", 1).get(0);
- items[3]=createCar("Toyota","Camry", 1).get(0);
- items[4]=createCar("GMC","Yukon", 1).get(0);
- items[5]=createCar("Infiniti","G35", 1).get(0);
- model.add(items);
+ if (model == null){
+ model = new ArrayList<DemoInventoryItem[]>();
+ for (int i = 0; i < 9; i++) {
+ DemoInventoryItem[] items = new DemoInventoryItem[6];
+ items[0]=createCar("Chevrolet","Corvette", 1).get(0);
+ items[1]=createCar("Ford","Explorer", 1).get(0);
+ items[2]=createCar("Nissan","Maxima", 1).get(0);
+ items[3]=createCar("Toyota","Camry", 1).get(0);
+ items[4]=createCar("GMC","Yukon", 1).get(0);
+ items[5]=createCar("Infiniti","G35", 1).get(0);
+ model.add(items);
+ }
}
return model;
}
17 years, 1 month
JBoss Rich Faces SVN: r13665 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/colorPicker/usage.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-17 17:18:57 -0400 (Fri, 17 Apr 2009)
New Revision: 13665
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/colorPicker/usage/sample.xhtml
Log:
sample improved after https://jira.jboss.org/jira/browse/RF-6845 fix
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/colorPicker/usage/sample.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/colorPicker/usage/sample.xhtml 2009-04-17 20:57:56 UTC (rev 13664)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/colorPicker/usage/sample.xhtml 2009-04-17 21:18:57 UTC (rev 13665)
@@ -13,7 +13,7 @@
<h:panelGroup>
<h:outputText value="Change text color " />
<rich:colorPicker colorMode="hex" value="#{paintData.color}">
- <a4j:support event="onsubmit" reRender="painter"/>
+ <a4j:support event="onchange" reRender="painter"/>
</rich:colorPicker>
</h:panelGroup>
</h:panelGrid>
17 years, 1 month
JBoss Rich Faces SVN: r13664 - trunk/samples/richfaces-demo.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2009-04-17 16:57:56 -0400 (Fri, 17 Apr 2009)
New Revision: 13664
Modified:
trunk/samples/richfaces-demo/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-6859
Modified: trunk/samples/richfaces-demo/pom.xml
===================================================================
--- trunk/samples/richfaces-demo/pom.xml 2009-04-17 20:04:09 UTC (rev 13663)
+++ trunk/samples/richfaces-demo/pom.xml 2009-04-17 20:57:56 UTC (rev 13664)
@@ -312,6 +312,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.richfaces.samples</groupId>
+ <artifactId>themes</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
17 years, 1 month
JBoss Rich Faces SVN: r13663 - trunk/docs/realworld_app_guide/en/src/main/docbook/modules.
by richfaces-svn-commits@lists.jboss.org
Author: atsebro
Date: 2009-04-17 16:04:09 -0400 (Fri, 17 Apr 2009)
New Revision: 13663
Modified:
trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml
Log:
Modified: trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml
===================================================================
--- trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml 2009-04-17 20:01:51 UTC (rev 13662)
+++ trunk/docs/realworld_app_guide/en/src/main/docbook/modules/getting_started.xml 2009-04-17 20:04:09 UTC (rev 13663)
@@ -35,7 +35,7 @@
<para>Follow the next steps for downloading and installing the Real World demo.</para>
<itemizedlist>
- <listitem><para><emphasis></>Checkout the project using installed SVN client</emphasis>.
+ <listitem><para><emphasis>Checkout the project using installed SVN client</emphasis>.
URL of repository: <code>https://svn.jboss.org/repos/richfaces/trunk/test-applications/realworld/</code>;</para></listitem>
<listitem><para><emphasis>Build the project</emphasis>.
Open command line console, point to the folder with checkouted project and tell Maven: <code>mvn clean install eclipse:eclipse</code>;</para></listitem>
17 years, 1 month