[richfaces-svn-commits] JBoss Rich Faces SVN: r13707 - in trunk/test-applications/realworld2: ejb/sql/short and 13 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Mon Apr 20 13:20:11 EDT 2009


Author: Alex.Kolonitsky
Date: 2009-04-20 13:20:11 -0400 (Mon, 20 Apr 2009)
New Revision: 13707

Added:
   trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/PhotoAlbumException.java
   trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/PhotoAlbumHelper.java
   trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/photoalbum-taglib.xml
   trunk/test-applications/realworld2/web/src/main/webapp/scripts/photoalbum.js
   trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/photoalbum.css
Removed:
   trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/RealworldException.java
   trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java
   trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
   trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js
   trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
Modified:
   trunk/test-applications/realworld2/ejb/sql/full/import.sql
   trunk/test-applications/realworld2/ejb/sql/short/import.sql
   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/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/ShelfAction.java
   trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/UserAction.java
   trunk/test-applications/realworld2/ejb/src/main/resources/META-INF/persistence.xml
   trunk/test-applications/realworld2/ejb/src/main/resources/components.properties
   trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml
   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/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java
   trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
   trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/components.xml
   trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml
   trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
   trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
Log:
rename realworld to photoalbum

Modified: trunk/test-applications/realworld2/ejb/sql/full/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/sql/full/import.sql	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/sql/full/import.sql	2009-04-20 17:20:11 UTC (rev 13707)
@@ -14,65 +14,63 @@
 
 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 comments(comment_id, date, message, image_id, user_id) VALUES (0, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',0, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (1, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',0, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (2, '1985-01-08', 'Beautiful colours. Nice close up. ',0, 1);
 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 (3, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',1, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (4, '1985-01-08', 'Very *lovely*',1, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (0, '1985-01-08', 'Gorgeous! Lovely color!',1, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (1, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',1, 3);
 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 (5, '1985-01-08', 'Wonderful.',2, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (6, '1985-01-08', 'love every thing about this picture, really beautiful... :))',2, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (7, '1985-01-08', 'Wonderful.',2, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (8, '1985-01-08', 'love every thing about this picture, really beautiful... :))',2, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (2, '1985-01-08', 'this is extremely Good:) Congratulations!',2, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (3, '1985-01-08', 'whoah ! wonderful',2, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (4, '1985-01-08', 'fantastic 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 (9, '1985-01-08', '++Beautiful',3, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (5, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',3, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (6, '1985-01-08', '++Beautiful',3, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (7, '1985-01-08', 'Amazing shot..',3, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (4, '2298556444_2151b7a6c4_o.jpg', '2298556444_2151b7a6c4_o.jpg', 'Animals - 2298556444_2151b7a6c4_o.jpg image',  '2009-12-18', 0, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 4);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (8, '1985-01-08', 'fantastic shot !!!!!!',4, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (9, '1985-01-08', '++Beautiful',4, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (10, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',4, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (5, '2508246015_313952406c_o.jpg', '2508246015_313952406c_o.jpg', 'Animals - 2508246015_313952406c_o.jpg image',  '2009-12-18', 0, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 5);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (10, '1985-01-08', 'Beautiful colours. Nice close up. ',5, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (11, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',5, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (12, '1985-01-08', 'Amazing shot..',5, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (13, '1985-01-08', 'that is a beautiful flower with great colours ',5, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (6, '2521898117_f2ebf233c9_o.jpg', '2521898117_f2ebf233c9_o.jpg', 'Animals - 2521898117_f2ebf233c9_o.jpg image',  '2009-12-18', 0, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 6);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (14, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',6, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (7, '308709862_f8f7fbcec4_b.jpg', '308709862_f8f7fbcec4_b.jpg', 'Animals - 308709862_f8f7fbcec4_b.jpg image',  '2009-12-18', 0, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 7);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (11, '1985-01-08', 'Bellissima macro!',7, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (8, '3390059723_4b2883ee59_o.jpg', '3390059723_4b2883ee59_o.jpg', 'Animals - 3390059723_4b2883ee59_o.jpg image',  '2009-12-18', 0, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 8);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (12, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',8, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (13, '1985-01-08', 'whoah ! wonderful',8, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (14, '1985-01-08', 'fantastic shot !!!!!!',8, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (15, '1985-01-08', 'this is extremely Good:) Congratulations!',8, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (16, '1985-01-08', 'Beautiful colours. Nice close up. ',8, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (9, '3390865548_e394404198_o.jpg', '3390865548_e394404198_o.jpg', 'Animals - 3390865548_e394404198_o.jpg image',  '2009-12-18', 0, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 9);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (15, '1985-01-08', 'Bellísima.!!! saludos.',9, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (16, '1985-01-08', 'this is extremely Good:) Congratulations!',9, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (17, '1985-01-08', 'I Think this is Art!',9, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (18, '1985-01-08', 'that is a beautiful flower with great colours ',9, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (19, '1985-01-08', 'Gorgeous! Lovely color!',9, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (20, '1985-01-08', 'Bellissima macro!',9, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10, '3390879696_059660d45c_o.jpg', '3390879696_059660d45c_o.jpg', 'Animals - 3390879696_059660d45c_o.jpg image',  '2009-12-18', 0, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 10);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (17, '1985-01-08', 'Wonderful.',10, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (18, '1985-01-08', 'whoah ! wonderful',10, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (21, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',10, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (22, '1985-01-08', 'this is extremely Good:) Congratulations!',10, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11, '3390886140_b05ae25b14_o.jpg', '3390886140_b05ae25b14_o.jpg', 'Animals - 3390886140_b05ae25b14_o.jpg image',  '2009-12-18', 0, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 11);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (19, '1985-01-08', 'Gorgeous! Lovely color!',11, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (12, '3413588364_dd0d602b9b_o.jpg', '3413588364_dd0d602b9b_o.jpg', 'Animals - 3413588364_dd0d602b9b_o.jpg image',  '2009-12-18', 0, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(0, 12);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (20, '1985-01-08', 'fantastic shot !!!!!!',12, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (21, '1985-01-08', 'Such a lovely colour azaga!',12, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (22, '1985-01-08', 'love every thing about this picture, really beautiful... :))',12, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (23, '1985-01-08', 'Wonderful.',12, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (24, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',12, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (13, '3415160108_c22eb69f37_o.jpg', '3415160108_c22eb69f37_o.jpg', 'Animals - 3415160108_c22eb69f37_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, 13);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (23, '1985-01-08', 'Stunning capture! :-)',13, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (24, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',13, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (25, '1985-01-08', 'this is extremely Good:) Congratulations!',13, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (25, '1985-01-08', 'whoah ! wonderful',13, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (14, '3415165572_f6d48c2a21_o.jpg', '3415165572_f6d48c2a21_o.jpg', 'Animals - 3415165572_f6d48c2a21_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, 14);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (26, '1985-01-08', 'Amazing shot..',14, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (27, '1985-01-08', 'Such a lovely colour azaga!',14, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (26, '1985-01-08', 'Very *lovely*',14, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (15, '839245545_5db77619d5_o.jpg', '839245545_5db77619d5_o.jpg', 'Animals - 839245545_5db77619d5_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, 15);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (28, '1985-01-08', 'Beautiful colours. Nice close up. ',15, 1);
 UPDATE albums set coveringimage_image_id=15 where album_id = 0;
 
 ---------------------------------------------------------------------
@@ -83,61 +81,51 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (16, '190193308_ce2a4de5fa_o.jpg', '190193308_ce2a4de5fa_o.jpg', 'Cars - 190193308_ce2a4de5fa_o.jpg image',  '2009-12-18', 1, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 16);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (29, '1985-01-08', 'Such a lovely colour azaga!',16, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (30, '1985-01-08', 'Bellissima macro!',16, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (31, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',16, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (27, '1985-01-08', 'Such a lovely colour azaga!',16, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (28, '1985-01-08', 'Beautiful colours. Nice close up. ',16, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (17, '1941230817_bcce17b8ef_o.jpg', '1941230817_bcce17b8ef_o.jpg', 'Cars - 1941230817_bcce17b8ef_o.jpg image',  '2009-12-18', 1, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 17);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (32, '1985-01-08', 'whoah ! wonderful',17, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (29, '1985-01-08', 'Bellísima.!!! saludos.',17, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (18, '2151423750_129317a034_o.jpg', '2151423750_129317a034_o.jpg', 'Cars - 2151423750_129317a034_o.jpg image',  '2009-12-18', 1, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 18);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (33, '1985-01-08', 'Wonderful.',18, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (34, '1985-01-08', 'Very *lovely*',18, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (35, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',18, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (36, '1985-01-08', 'Very *lovely*',18, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (30, '1985-01-08', 'Stunning capture! :-)',18, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (19, '2233985073_9a3fd7d3ac_b.jpg', '2233985073_9a3fd7d3ac_b.jpg', 'Cars - 2233985073_9a3fd7d3ac_b.jpg image',  '2009-12-18', 1, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 19);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (37, '1985-01-08', 'Amazing shot..',19, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (38, '1985-01-08', 'Beautiful colours. Nice close up. ',19, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (39, '1985-01-08', 'Stunning capture! :-)',19, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (40, '1985-01-08', 'Stunning capture! :-)',19, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (20, '2386071696_2b4e84eddb_o.jpg', '2386071696_2b4e84eddb_o.jpg', 'Cars - 2386071696_2b4e84eddb_o.jpg image',  '2009-12-18', 1, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 20);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (41, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',20, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (31, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',20, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (32, '1985-01-08', 'Amazing shot..',20, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (33, '1985-01-08', 'whoah ! wonderful',20, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (21, '3089719367_a03a2b55a4_b.jpg', '3089719367_a03a2b55a4_b.jpg', 'Cars - 3089719367_a03a2b55a4_b.jpg image',  '2009-12-18', 1, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 21);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (42, '1985-01-08', 'Such a lovely colour azaga!',21, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (34, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',21, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (35, '1985-01-08', 'love every thing about this picture, really beautiful... :))',21, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (36, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',21, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (22, '3200944376_2867888262_b.jpg', '3200944376_2867888262_b.jpg', 'Cars - 3200944376_2867888262_b.jpg image',  '2009-12-18', 1, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 22);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (43, '1985-01-08', 'whoah ! wonderful',22, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (37, '1985-01-08', 'I Think this is Art!',22, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (23, '3286825259_2a927e8ec1_o.jpg', '3286825259_2a927e8ec1_o.jpg', 'Cars - 3286825259_2a927e8ec1_o.jpg image',  '2009-12-18', 1, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 23);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (44, '1985-01-08', 'Bellissima macro!',23, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (45, '1985-01-08', 'Bellísima.!!! saludos.',23, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (46, '1985-01-08', 'Wonderful.',23, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (47, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',23, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (38, '1985-01-08', 'fantastic shot !!!!!!',23, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (39, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',23, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (40, '1985-01-08', 'that is a beautiful flower with great colours ',23, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (24, '3287637120_c1b3495371_o.jpg', '3287637120_c1b3495371_o.jpg', 'Cars - 3287637120_c1b3495371_o.jpg image',  '2009-12-18', 1, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 24);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (48, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',24, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (49, '1985-01-08', 'Gorgeous! Lovely color!',24, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (50, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',24, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (25, '3327664478_7f77093f52_o.jpg', '3327664478_7f77093f52_o.jpg', 'Cars - 3327664478_7f77093f52_o.jpg image',  '2009-12-18', 1, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 25);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (51, '1985-01-08', 'whoah ! wonderful',25, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (41, '1985-01-08', 'nice shot =) ',25, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (42, '1985-01-08', 'Beautiful colours. Nice close up. ',25, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (43, '1985-01-08', 'Gorgeous! Lovely color!',25, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (26, '361088850_73d4bef19a_o.jpg', '361088850_73d4bef19a_o.jpg', 'Cars - 361088850_73d4bef19a_o.jpg image',  '2009-12-18', 1, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 26);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (52, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',26, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (53, '1985-01-08', 'Bellissima macro!',26, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (44, '1985-01-08', 'Bellissima macro!',26, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (27, '361091514_20cd7e7eea_o.jpg', '361091514_20cd7e7eea_o.jpg', 'Cars - 361091514_20cd7e7eea_o.jpg image',  '2009-12-18', 1, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 27);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (54, '1985-01-08', 'Wonderful.',27, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (55, '1985-01-08', 'Amazing shot..',27, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (56, '1985-01-08', 'Such a lovely colour azaga!',27, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (28, '361092609_25d6d4bd90_o.jpg', '361092609_25d6d4bd90_o.jpg', 'Cars - 361092609_25d6d4bd90_o.jpg image',  '2009-12-18', 1, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 28);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (57, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',28, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (29, '400440032_a63fe65cab_o.jpg', '400440032_a63fe65cab_o.jpg', 'Cars - 400440032_a63fe65cab_o.jpg image',  '2009-12-18', 1, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 29);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (45, '1985-01-08', 'this is extremely Good:) Congratulations!',29, 2);
 UPDATE albums set coveringimage_image_id=29 where album_id = 1;
 
 ---------------------------------------------------------------------
@@ -148,87 +136,92 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (30, '05[303x457].jpg', '05[303x457].jpg', 'Monuments and just buildings - 05[303x457].jpg image',  '2009-12-18', 2, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 30);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (58, '1985-01-08', 'Beautiful colours. Nice close up. ',30, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (59, '1985-01-08', 'Beautiful colours. Nice close up. ',30, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (60, '1985-01-08', 'I Think this is Art!',30, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (61, '1985-01-08', 'nice shot =) ',30, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (31, '07[303x457].jpg', '07[303x457].jpg', 'Monuments and just buildings - 07[303x457].jpg image',  '2009-12-18', 2, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 31);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (62, '1985-01-08', 'Such a lovely colour azaga!',31, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (63, '1985-01-08', 'whoah ! wonderful',31, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (64, '1985-01-08', 'whoah ! wonderful',31, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (65, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',31, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (46, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',31, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (47, '1985-01-08', 'Bellísima.!!! saludos.',31, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (48, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',31, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (49, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',31, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (32, '1805365000_ca64d20b10_o.jpg', '1805365000_ca64d20b10_o.jpg', 'Monuments and just buildings - 1805365000_ca64d20b10_o.jpg image',  '2009-12-18', 2, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 32);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (66, '1985-01-08', 'love every thing about this picture, really beautiful... :))',32, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (67, '1985-01-08', 'I Think this is Art!',32, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (50, '1985-01-08', 'Bellissima macro!',32, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (51, '1985-01-08', 'Such a lovely colour azaga!',32, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (33, '1[303x457].jpg', '1[303x457].jpg', 'Monuments and just buildings - 1[303x457].jpg image',  '2009-12-18', 2, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 33);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (52, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',33, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (53, '1985-01-08', 'Gorgeous! Lovely color!',33, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (54, '1985-01-08', 'Perfecft!',33, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (55, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',33, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (34, '2099090261_1efb89ae95_o.jpg', '2099090261_1efb89ae95_o.jpg', 'Monuments and just buildings - 2099090261_1efb89ae95_o.jpg image',  '2009-12-18', 2, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 34);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (56, '1985-01-08', 'that is a beautiful flower with great colours ',34, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (57, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',34, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (58, '1985-01-08', 'Bellissima macro!',34, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (35, '2976358258_5c08813ddf_o.jpg', '2976358258_5c08813ddf_o.jpg', 'Monuments and just buildings - 2976358258_5c08813ddf_o.jpg image',  '2009-12-18', 2, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 35);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (68, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',35, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (69, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',35, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (59, '1985-01-08', 'I Think this is Art!',35, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (36, '2[457x303].jpg', '2[457x303].jpg', 'Monuments and just buildings - 2[457x303].jpg image',  '2009-12-18', 2, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 36);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (70, '1985-01-08', 'Such a lovely colour azaga!',36, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (71, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',36, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (72, '1985-01-08', 'Bellísima.!!! saludos.',36, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (60, '1985-01-08', 'whoah ! wonderful',36, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (37, '32971256_8bd6bf165d_o.jpg', '32971256_8bd6bf165d_o.jpg', 'Monuments and just buildings - 32971256_8bd6bf165d_o.jpg image',  '2009-12-18', 2, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 37);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (73, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',37, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (74, '1985-01-08', 'nice shot =) ',37, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (61, '1985-01-08', 'that is a beautiful flower with great colours ',37, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (62, '1985-01-08', 'Stunning capture! :-)',37, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (63, '1985-01-08', 'fantastic shot !!!!!!',37, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (38, '3392872753_e47f1c7078_o.jpg', '3392872753_e47f1c7078_o.jpg', 'Monuments and just buildings - 3392872753_e47f1c7078_o.jpg image',  '2009-12-18', 2, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 38);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (75, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',38, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (64, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',38, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (65, '1985-01-08', 'this is extremely Good:) Congratulations!',38, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (39, '3397511520_9839039136_o.jpg', '3397511520_9839039136_o.jpg', 'Monuments and just buildings - 3397511520_9839039136_o.jpg image',  '2009-12-18', 2, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 39);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (76, '1985-01-08', 'love every thing about this picture, really beautiful... :))',39, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (77, '1985-01-08', 'Amazing shot..',39, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (78, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',39, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (79, '1985-01-08', 'fantastic shot !!!!!!',39, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (66, '1985-01-08', 'Such a lovely colour azaga!',39, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (40, '3399540332_576df61129_o.jpg', '3399540332_576df61129_o.jpg', 'Monuments and just buildings - 3399540332_576df61129_o.jpg image',  '2009-12-18', 2, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 40);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (80, '1985-01-08', 'Bellísima.!!! saludos.',40, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (67, '1985-01-08', 'Stunning capture! :-)',40, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (68, '1985-01-08', 'Bellísima.!!! saludos.',40, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (69, '1985-01-08', 'Beautiful colours. Nice close up. ',40, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (41, '3403152285_3e72d1264a_o.jpg', '3403152285_3e72d1264a_o.jpg', 'Monuments and just buildings - 3403152285_3e72d1264a_o.jpg image',  '2009-12-18', 2, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 41);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (70, '1985-01-08', 'Bellissima macro!',41, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (71, '1985-01-08', '++Beautiful',41, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (72, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',41, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (73, '1985-01-08', 'that is a beautiful flower with great colours ',41, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (42, '3413630679_d77f525413_o.jpg', '3413630679_d77f525413_o.jpg', 'Monuments and just buildings - 3413630679_d77f525413_o.jpg image',  '2009-12-18', 2, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 42);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (81, '1985-01-08', 'Gorgeous! Lovely color!',42, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (82, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',42, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (83, '1985-01-08', 'Gorgeous! Lovely color!',42, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (84, '1985-01-08', 'Such a lovely colour azaga!',42, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (74, '1985-01-08', 'whoah ! wonderful',42, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (75, '1985-01-08', 'whoah ! wonderful',42, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (76, '1985-01-08', 'Very *lovely*',42, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (77, '1985-01-08', 'Stunning capture! :-)',42, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (43, '3414974777_a4f44f69c7_o.jpg', '3414974777_a4f44f69c7_o.jpg', 'Monuments and just buildings - 3414974777_a4f44f69c7_o.jpg image',  '2009-12-18', 2, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 43);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (85, '1985-01-08', 'that is a beautiful flower with great colours ',43, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (86, '1985-01-08', 'Very *lovely*',43, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (78, '1985-01-08', 'Very *lovely*',43, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (79, '1985-01-08', 'Beautiful colours. Nice close up. ',43, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (80, '1985-01-08', 'Perfecft!',43, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (44, '3415278215_968db2dbbf_o.jpg', '3415278215_968db2dbbf_o.jpg', 'Monuments and just buildings - 3415278215_968db2dbbf_o.jpg image',  '2009-12-18', 2, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 44);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (87, '1985-01-08', 'this is extremely Good:) Congratulations!',44, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (81, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',44, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (82, '1985-01-08', 'Stunning capture! :-)',44, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (83, '1985-01-08', 'that is a beautiful flower with great colours ',44, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (45, '3415840434_949aeabf08_o.jpg', '3415840434_949aeabf08_o.jpg', 'Monuments and just buildings - 3415840434_949aeabf08_o.jpg image',  '2009-12-18', 2, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 45);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (88, '1985-01-08', 'this is extremely Good:) Congratulations!',45, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (46, '370031898_84e952e0b0_o.jpg', '370031898_84e952e0b0_o.jpg', 'Monuments and just buildings - 370031898_84e952e0b0_o.jpg image',  '2009-12-18', 2, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 46);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (89, '1985-01-08', 'I Think this is Art!',46, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (90, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',46, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (84, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',46, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (85, '1985-01-08', 'nice shot =) ',46, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (86, '1985-01-08', 'Stunning capture! :-)',46, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (87, '1985-01-08', 'this is extremely Good:) Congratulations!',46, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (47, '381889523_f276d45e9d_o.jpg', '381889523_f276d45e9d_o.jpg', 'Monuments and just buildings - 381889523_f276d45e9d_o.jpg image',  '2009-12-18', 2, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 47);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (91, '1985-01-08', 'Wonderful.',47, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (92, '1985-01-08', 'Stunning capture! :-)',47, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (88, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',47, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (48, '441026665_07699ebddd_o.jpg', '441026665_07699ebddd_o.jpg', 'Monuments and just buildings - 441026665_07699ebddd_o.jpg image',  '2009-12-18', 2, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 48);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (93, '1985-01-08', 'Gorgeous! Lovely color!',48, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (94, '1985-01-08', 'Such a lovely colour azaga!',48, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (95, '1985-01-08', 'Amazing shot..',48, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (96, '1985-01-08', 'fantastic shot !!!!!!',48, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (89, '1985-01-08', 'whoah ! wonderful',48, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (49, '4[457x303].jpg', '4[457x303].jpg', 'Monuments and just buildings - 4[457x303].jpg image',  '2009-12-18', 2, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 49);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (50, '960942349_dcc90c0a61_o.jpg', '960942349_dcc90c0a61_o.jpg', 'Monuments and just buildings - 960942349_dcc90c0a61_o.jpg image',  '2009-12-18', 2, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 50);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (97, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',50, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (98, '1985-01-08', 'love every thing about this picture, really beautiful... :))',50, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (90, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',50, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (91, '1985-01-08', '++Beautiful',50, 2);
 UPDATE albums set coveringimage_image_id=50 where album_id = 2;
 
 ---------------------------------------------------------------------
@@ -239,94 +232,90 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (51, '01[303x202].jpg', '01[303x202].jpg', 'Nature - 01[303x202].jpg image',  '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 51);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (99, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',51, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (100, '1985-01-08', '++Beautiful',51, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (92, '1985-01-08', 'Wonderful.',51, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (93, '1985-01-08', 'love every thing about this picture, really beautiful... :))',51, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (94, '1985-01-08', 'Such a lovely colour azaga!',51, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (52, '1[305x457].jpg', '1[305x457].jpg', 'Nature - 1[305x457].jpg image',  '2009-12-18', 3, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 52);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (101, '1985-01-08', 'love every thing about this picture, really beautiful... :))',52, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (102, '1985-01-08', 'Very *lovely*',52, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (103, '1985-01-08', 'that is a beautiful flower with great colours ',52, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (53, '273927725_c9f5ef5952_o.jpg', '273927725_c9f5ef5952_o.jpg', 'Nature - 273927725_c9f5ef5952_o.jpg image',  '2009-12-18', 3, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 53);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (104, '1985-01-08', 'Such a lovely colour azaga!',53, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (105, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',53, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (106, '1985-01-08', 'this is extremely Good:) Congratulations!',53, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (107, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',53, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (95, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',53, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (96, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',53, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (97, '1985-01-08', 'whoah ! wonderful',53, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (98, '1985-01-08', 'that is a beautiful flower with great colours ',53, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (54, '2[303x457].jpg', '2[303x457].jpg', 'Nature - 2[303x457].jpg image',  '2009-12-18', 3, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 54);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (108, '1985-01-08', 'nice shot =) ',54, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (109, '1985-01-08', 'Amazing shot..',54, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (110, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',54, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (111, '1985-01-08', 'Beautiful colours. Nice close up. ',54, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (99, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',54, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (100, '1985-01-08', 'fantastic shot !!!!!!',54, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (55, '3392730627_1cdb18cba6_o.jpg', '3392730627_1cdb18cba6_o.jpg', 'Nature - 3392730627_1cdb18cba6_o.jpg image',  '2009-12-18', 3, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 55);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (112, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',55, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (113, '1985-01-08', 'I Think this is Art!',55, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (114, '1985-01-08', 'Bellissima macro!',55, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (101, '1985-01-08', 'Stunning capture! :-)',55, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (102, '1985-01-08', 'Bellissima macro!',55, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (56, '3392993334_36d7f097df_o.jpg', '3392993334_36d7f097df_o.jpg', 'Nature - 3392993334_36d7f097df_o.jpg image',  '2009-12-18', 3, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 56);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (115, '1985-01-08', 'Stunning capture! :-)',56, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (57, '3393235094_7cc613d363_o.jpg', '3393235094_7cc613d363_o.jpg', 'Nature - 3393235094_7cc613d363_o.jpg image',  '2009-12-18', 3, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 57);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (116, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',57, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (103, '1985-01-08', 'nice shot =) ',57, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (104, '1985-01-08', 'nice shot =) ',57, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (58, '3412793157_683290a536_o.jpg', '3412793157_683290a536_o.jpg', 'Nature - 3412793157_683290a536_o.jpg image',  '2009-12-18', 3, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 58);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (117, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',58, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (118, '1985-01-08', 'that is a beautiful flower with great colours ',58, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (105, '1985-01-08', 'Bellísima.!!! saludos.',58, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (106, '1985-01-08', 'nice shot =) ',58, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (107, '1985-01-08', 'Amazing shot..',58, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (59, '3414996504_b42abb3be6_o.jpg', '3414996504_b42abb3be6_o.jpg', 'Nature - 3414996504_b42abb3be6_o.jpg image',  '2009-12-18', 3, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 59);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (119, '1985-01-08', '++Beautiful',59, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (108, '1985-01-08', 'love every thing about this picture, really beautiful... :))',59, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (60, '3415639261_20d2d3b52c_o.jpg', '3415639261_20d2d3b52c_o.jpg', 'Nature - 3415639261_20d2d3b52c_o.jpg image',  '2009-12-18', 3, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 60);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (61, '3416307534_40f6616283_o.jpg', '3416307534_40f6616283_o.jpg', 'Nature - 3416307534_40f6616283_o.jpg image',  '2009-12-18', 3, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 61);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (120, '1985-01-08', 'Amazing shot..',61, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (121, '1985-01-08', 'Wonderful.',61, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (109, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',61, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (62, '3416321407_068332d9f2_o.jpg', '3416321407_068332d9f2_o.jpg', 'Nature - 3416321407_068332d9f2_o.jpg image',  '2009-12-18', 3, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 62);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (122, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',62, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (123, '1985-01-08', 'Amazing shot..',62, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (124, '1985-01-08', 'nice shot =) ',62, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (125, '1985-01-08', 'love every thing about this picture, really beautiful... :))',62, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (110, '1985-01-08', 'Wonderful.',62, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (111, '1985-01-08', 'fantastic shot !!!!!!',62, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (112, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',62, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (63, '3416371116_f793561d19_o.jpg', '3416371116_f793561d19_o.jpg', 'Nature - 3416371116_f793561d19_o.jpg image',  '2009-12-18', 3, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 63);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (126, '1985-01-08', 'Bellissima macro!',63, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (127, '1985-01-08', 'nice shot =) ',63, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (128, '1985-01-08', 'Such a lovely colour azaga!',63, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (129, '1985-01-08', 'Stunning capture! :-)',63, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (113, '1985-01-08', '++Beautiful',63, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (114, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',63, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (115, '1985-01-08', 'Such a lovely colour azaga!',63, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (116, '1985-01-08', 'fantastic shot !!!!!!',63, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (64, '3417131300_2aac5ec32c_o.jpg', '3417131300_2aac5ec32c_o.jpg', 'Nature - 3417131300_2aac5ec32c_o.jpg image',  '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 64);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (130, '1985-01-08', 'Amazing shot..',64, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (117, '1985-01-08', 'Very *lovely*',64, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (65, '3417132360_56d0b48a9d_o.jpg', '3417132360_56d0b48a9d_o.jpg', 'Nature - 3417132360_56d0b48a9d_o.jpg image',  '2009-12-18', 3, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 65);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (118, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',65, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (66, '3417319507_8d1f2d5c77_o.jpg', '3417319507_8d1f2d5c77_o.jpg', 'Nature - 3417319507_8d1f2d5c77_o.jpg image',  '2009-12-18', 3, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 66);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (131, '1985-01-08', 'Perfecft!',66, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (132, '1985-01-08', 'I Think this is Art!',66, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (119, '1985-01-08', 'Such a lovely colour azaga!',66, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (120, '1985-01-08', '++Beautiful',66, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (121, '1985-01-08', 'that is a beautiful flower with great colours ',66, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (122, '1985-01-08', 'Perfecft!',66, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (67, '3417494725_e21724aba9_o.jpg', '3417494725_e21724aba9_o.jpg', 'Nature - 3417494725_e21724aba9_o.jpg image',  '2009-12-18', 3, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 67);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (133, '1985-01-08', 'Bellísima.!!! saludos.',67, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (134, '1985-01-08', 'Gorgeous! Lovely color!',67, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (135, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',67, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (136, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',67, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (123, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',67, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (124, '1985-01-08', 'that is a beautiful flower with great colours ',67, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (125, '1985-01-08', '++Beautiful',67, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (68, '3418371942_a61ae58de4_o.jpg', '3418371942_a61ae58de4_o.jpg', 'Nature - 3418371942_a61ae58de4_o.jpg image',  '2009-12-18', 3, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 68);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (137, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',68, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (138, '1985-01-08', '++Beautiful',68, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (139, '1985-01-08', 'Bellísima.!!! saludos.',68, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (69, '345009210_1f826cd5a1_o.jpg', '345009210_1f826cd5a1_o.jpg', 'Nature - 345009210_1f826cd5a1_o.jpg image',  '2009-12-18', 3, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 69);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (140, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',69, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (126, '1985-01-08', 'Bellísima.!!! saludos.',69, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (127, '1985-01-08', 'Amazing shot..',69, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (70, '55109059_55408b3d5f_o.jpg', '55109059_55408b3d5f_o.jpg', 'Nature - 55109059_55408b3d5f_o.jpg image',  '2009-12-18', 3, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 70);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (71, '570841724_b11c8b0df2_o.jpg', '570841724_b11c8b0df2_o.jpg', 'Nature - 570841724_b11c8b0df2_o.jpg image',  '2009-12-18', 3, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 71);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (141, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',71, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (142, '1985-01-08', 'Bellissima macro!',71, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (128, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',71, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (129, '1985-01-08', '++Beautiful',71, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (72, '672840660_4a91f39f02_o.jpg', '672840660_4a91f39f02_o.jpg', 'Nature - 672840660_4a91f39f02_o.jpg image',  '2009-12-18', 3, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 72);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (143, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',72, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (144, '1985-01-08', 'nice shot =) ',72, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (130, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',72, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (131, '1985-01-08', 'Stunning capture! :-)',72, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (132, '1985-01-08', 'this is extremely Good:) Congratulations!',72, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (133, '1985-01-08', 'this is extremely Good:) Congratulations!',72, 3);
 UPDATE albums set coveringimage_image_id=72 where album_id = 3;
 
 ---------------------------------------------------------------------
@@ -337,74 +326,69 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (73, '02[303x202].jpg', '02[303x202].jpg', 'Portrait - 02[303x202].jpg image',  '2009-12-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 73);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (145, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',73, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (146, '1985-01-08', 'Beautiful colours. Nice close up. ',73, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (147, '1985-01-08', 'Stunning capture! :-)',73, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (148, '1985-01-08', 'Wonderful.',73, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (134, '1985-01-08', 'Wonderful.',73, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (135, '1985-01-08', 'Beautiful colours. Nice close up. ',73, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (136, '1985-01-08', 'Perfecft!',73, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (137, '1985-01-08', 'that is a beautiful flower with great colours ',73, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (74, '1033975999_7e058fcf1c_o.jpg', '1033975999_7e058fcf1c_o.jpg', 'Portrait - 1033975999_7e058fcf1c_o.jpg image',  '2009-12-18', 4, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 74);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (149, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',74, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (150, '1985-01-08', 'Very *lovely*',74, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (151, '1985-01-08', 'Bellísima.!!! saludos.',74, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (138, '1985-01-08', 'this is extremely Good:) Congratulations!',74, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (75, '1516027705_ddff0a70dd_o.jpg', '1516027705_ddff0a70dd_o.jpg', 'Portrait - 1516027705_ddff0a70dd_o.jpg image',  '2009-12-18', 4, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 75);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (139, '1985-01-08', '++Beautiful',75, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (76, '1799039821_b6ee53167c_o.jpg', '1799039821_b6ee53167c_o.jpg', 'Portrait - 1799039821_b6ee53167c_o.jpg image',  '2009-12-18', 4, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 76);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (152, '1985-01-08', 'that is a beautiful flower with great colours ',76, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (153, '1985-01-08', 'Bellísima.!!! saludos.',76, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (154, '1985-01-08', 'nice shot =) ',76, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (140, '1985-01-08', 'Stunning capture! :-)',76, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (77, '19654343_f445e1efa2_o.jpg', '19654343_f445e1efa2_o.jpg', 'Portrait - 19654343_f445e1efa2_o.jpg image',  '2009-12-18', 4, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 77);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (155, '1985-01-08', 'Very *lovely*',77, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (156, '1985-01-08', 'Amazing shot..',77, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (141, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',77, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (142, '1985-01-08', 'this is extremely Good:) Congratulations!',77, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (143, '1985-01-08', 'Beautiful colours. Nice close up. ',77, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (78, '2187016030_e81b911b3e_o.jpg', '2187016030_e81b911b3e_o.jpg', 'Portrait - 2187016030_e81b911b3e_o.jpg image',  '2009-12-18', 4, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 78);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (157, '1985-01-08', 'Bellísima.!!! saludos.',78, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (79, '2307649188_a6206c17a4_o.jpg', '2307649188_a6206c17a4_o.jpg', 'Portrait - 2307649188_a6206c17a4_o.jpg image',  '2009-12-18', 4, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 79);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (158, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',79, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (159, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',79, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (144, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',79, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (80, '2879155528_1ebbaaf951_o.jpg', '2879155528_1ebbaaf951_o.jpg', 'Portrait - 2879155528_1ebbaaf951_o.jpg image',  '2009-12-18', 4, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 80);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (81, '2933904745_b323535d4a_o.jpg', '2933904745_b323535d4a_o.jpg', 'Portrait - 2933904745_b323535d4a_o.jpg image',  '2009-12-18', 4, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 81);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (160, '1985-01-08', 'Such a lovely colour azaga!',81, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (161, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',81, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (162, '1985-01-08', 'Beautiful colours. Nice close up. ',81, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (145, '1985-01-08', 'Very *lovely*',81, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (146, '1985-01-08', '++Beautiful',81, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (147, '1985-01-08', 'Bellísima.!!! saludos.',81, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (82, '3-3.jpg', '3-3.jpg', 'Portrait - 3-3.jpg image',  '2009-12-18', 4, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 82);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (163, '1985-01-08', 'Wonderful.',82, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (164, '1985-01-08', 'Bellissima macro!',82, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (165, '1985-01-08', 'I Think this is Art!',82, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (148, '1985-01-08', 'that is a beautiful flower with great colours ',82, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (149, '1985-01-08', 'this is extremely Good:) Congratulations!',82, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (83, '3176975826_ef29a459fa_o.jpg', '3176975826_ef29a459fa_o.jpg', 'Portrait - 3176975826_ef29a459fa_o.jpg image',  '2009-12-18', 4, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 83);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (150, '1985-01-08', 'Bellísima.!!! saludos.',83, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (151, '1985-01-08', 'Bellísima.!!! saludos.',83, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (84, '323301225_3aef765e5a_o.jpg', '323301225_3aef765e5a_o.jpg', 'Portrait - 323301225_3aef765e5a_o.jpg image',  '2009-12-18', 4, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 84);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (166, '1985-01-08', 'Bellísima.!!! saludos.',84, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (167, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',84, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (168, '1985-01-08', 'Very *lovely*',84, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (152, '1985-01-08', 'Gorgeous! Lovely color!',84, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (153, '1985-01-08', 'love every thing about this picture, really beautiful... :))',84, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (154, '1985-01-08', 'whoah ! wonderful',84, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (85, 'img_0103.jpg', 'img_0103.jpg', 'Portrait - img_0103.jpg image',  '2009-12-18', 4, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 85);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (169, '1985-01-08', 'Such a lovely colour azaga!',85, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (170, '1985-01-08', 'Very *lovely*',85, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (171, '1985-01-08', 'this is extremely Good:) Congratulations!',85, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (172, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',85, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (155, '1985-01-08', 'Very *lovely*',85, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (156, '1985-01-08', 'fantastic shot !!!!!!',85, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (86, '_mg_0161.jpg', '_mg_0161.jpg', 'Portrait - _mg_0161.jpg image',  '2009-12-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 86);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (173, '1985-01-08', 'this is extremely Good:) Congratulations!',86, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (174, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',86, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (157, '1985-01-08', '++Beautiful',86, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (158, '1985-01-08', 'whoah ! wonderful',86, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (87, '_mg_0264.jpg', '_mg_0264.jpg', 'Portrait - _mg_0264.jpg image',  '2009-12-18', 4, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 87);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (175, '1985-01-08', 'fantastic shot !!!!!!',87, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (176, '1985-01-08', 'love every thing about this picture, really beautiful... :))',87, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (159, '1985-01-08', 'Such a lovely colour azaga!',87, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (88, '_mg_0510.jpg', '_mg_0510.jpg', 'Portrait - _mg_0510.jpg image',  '2009-12-18', 4, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 88);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (177, '1985-01-08', 'Bellísima.!!! saludos.',88, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (178, '1985-01-08', 'Gorgeous! Lovely color!',88, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (160, '1985-01-08', 'fantastic shot !!!!!!',88, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (161, '1985-01-08', 'this is extremely Good:) Congratulations!',88, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (162, '1985-01-08', 'Wonderful.',88, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (89, '_mg_1788.jpg', '_mg_1788.jpg', 'Portrait - _mg_1788.jpg image',  '2009-12-18', 4, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 89);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (179, '1985-01-08', 'love every thing about this picture, really beautiful... :))',89, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (180, '1985-01-08', 'this is extremely Good:) Congratulations!',89, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (163, '1985-01-08', 'that is a beautiful flower with great colours ',89, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (164, '1985-01-08', 'Gorgeous! Lovely color!',89, 1);
 UPDATE albums set coveringimage_image_id=89 where album_id = 4;
 
 ---------------------------------------------------------------------
@@ -415,60 +399,65 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (90, '103193233_860c47c909_o.jpg', '103193233_860c47c909_o.jpg', 'Sport - 103193233_860c47c909_o.jpg image',  '2009-12-18', 5, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 90);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (181, '1985-01-08', 'this is extremely Good:) Congratulations!',90, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (182, '1985-01-08', 'Beautiful colours. Nice close up. ',90, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (183, '1985-01-08', 'Such a lovely colour azaga!',90, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (184, '1985-01-08', 'Perfecft!',90, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (165, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',90, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (166, '1985-01-08', 'I Think this is Art!',90, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (167, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',90, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (168, '1985-01-08', 'fantastic shot !!!!!!',90, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (91, '1350250361_2d963dd4e7_o.jpg', '1350250361_2d963dd4e7_o.jpg', 'Sport - 1350250361_2d963dd4e7_o.jpg image',  '2009-12-18', 5, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 91);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (185, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',91, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (169, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',91, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (170, '1985-01-08', 'Gorgeous! Lovely color!',91, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (171, '1985-01-08', 'Beautiful colours. Nice close up. ',91, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (172, '1985-01-08', 'whoah ! wonderful',91, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (92, '2042654579_d25c0db64f_o.jpg', '2042654579_d25c0db64f_o.jpg', 'Sport - 2042654579_d25c0db64f_o.jpg image',  '2009-12-18', 5, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 92);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (173, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',92, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (174, '1985-01-08', 'Gorgeous! Lovely color!',92, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (93, '2158910844_e5a6deeeab_o.jpg', '2158910844_e5a6deeeab_o.jpg', 'Sport - 2158910844_e5a6deeeab_o.jpg image',  '2009-12-18', 5, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 93);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (175, '1985-01-08', 'whoah ! wonderful',93, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (176, '1985-01-08', 'Bellissima macro!',93, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (177, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',93, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (94, '2228156682_74520fa2e5_o.jpg', '2228156682_74520fa2e5_o.jpg', 'Sport - 2228156682_74520fa2e5_o.jpg image',  '2009-12-18', 5, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 94);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (186, '1985-01-08', 'Wonderful.',94, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (187, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',94, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (188, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',94, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (178, '1985-01-08', 'Perfecft!',94, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (95, '2264670815_82c5619ec6_o.jpg', '2264670815_82c5619ec6_o.jpg', 'Sport - 2264670815_82c5619ec6_o.jpg image',  '2009-12-18', 5, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 95);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (189, '1985-01-08', 'Very *lovely*',95, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (179, '1985-01-08', 'that is a beautiful flower with great colours ',95, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (180, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',95, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (181, '1985-01-08', 'that is a beautiful flower with great colours ',95, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (182, '1985-01-08', '++Beautiful',95, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (96, '2266019996_6b7fcb9d41_o.jpg', '2266019996_6b7fcb9d41_o.jpg', 'Sport - 2266019996_6b7fcb9d41_o.jpg image',  '2009-12-18', 5, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 96);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (190, '1985-01-08', 'love every thing about this picture, really beautiful... :))',96, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (183, '1985-01-08', 'fantastic shot !!!!!!',96, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (97, '2338319633_4feac41833_o.jpg', '2338319633_4feac41833_o.jpg', 'Sport - 2338319633_4feac41833_o.jpg image',  '2009-12-18', 5, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 97);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (191, '1985-01-08', 'Amazing shot..',97, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (192, '1985-01-08', 'that is a beautiful flower with great colours ',97, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (184, '1985-01-08', 'this is extremely Good:) Congratulations!',97, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (98, '2541626690_d6c35f7122_o.jpg', '2541626690_d6c35f7122_o.jpg', 'Sport - 2541626690_d6c35f7122_o.jpg image',  '2009-12-18', 5, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 98);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (193, '1985-01-08', 'Beautiful colours. Nice close up. ',98, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (194, '1985-01-08', 'nice shot =) ',98, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (195, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',98, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (99, '2760610141_8a56e469d0_o.jpg', '2760610141_8a56e469d0_o.jpg', 'Sport - 2760610141_8a56e469d0_o.jpg image',  '2009-12-18', 5, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 99);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (196, '1985-01-08', 'nice shot =) ',99, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (197, '1985-01-08', 'this is extremely Good:) Congratulations!',99, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (198, '1985-01-08', 'I Think this is Art!',99, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (185, '1985-01-08', 'whoah ! wonderful',99, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (186, '1985-01-08', 'I Think this is Art!',99, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (100, '2767537621_e378165405_o.jpg', '2767537621_e378165405_o.jpg', 'Sport - 2767537621_e378165405_o.jpg image',  '2009-12-18', 5, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 100);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (199, '1985-01-08', 'nice shot =) ',100, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (101, '2813129574_018acd119d_o.jpg', '2813129574_018acd119d_o.jpg', 'Sport - 2813129574_018acd119d_o.jpg image',  '2009-12-18', 5, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 101);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (187, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',101, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (102, '2832747707_fb68c8147f_o.jpg', '2832747707_fb68c8147f_o.jpg', 'Sport - 2832747707_fb68c8147f_o.jpg image',  '2009-12-18', 5, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 102);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (200, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',102, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (201, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',102, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (188, '1985-01-08', 'fantastic shot !!!!!!',102, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (189, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',102, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (190, '1985-01-08', 'Such a lovely colour azaga!',102, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (191, '1985-01-08', 'Stunning capture! :-)',102, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (103, '3037432738_e4b2388861_o.jpg', '3037432738_e4b2388861_o.jpg', 'Sport - 3037432738_e4b2388861_o.jpg image',  '2009-12-18', 5, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 103);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (202, '1985-01-08', 'Wonderful.',103, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (203, '1985-01-08', 'Bellissima macro!',103, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (204, '1985-01-08', 'that is a beautiful flower with great colours ',103, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (192, '1985-01-08', 'Wonderful.',103, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (104, '413103429_50ff9d8ae3_o.jpg', '413103429_50ff9d8ae3_o.jpg', 'Sport - 413103429_50ff9d8ae3_o.jpg image',  '2009-12-18', 5, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 104);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (205, '1985-01-08', '++Beautiful',104, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (206, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',104, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (193, '1985-01-08', 'love every thing about this picture, really beautiful... :))',104, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (194, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',104, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (195, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',104, 2);
 UPDATE albums set coveringimage_image_id=104 where album_id = 5;
 
 ---------------------------------------------------------------------
@@ -479,125 +468,62 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (105, '117215467_5cccef9aaa_b.jpg', '117215467_5cccef9aaa_b.jpg', 'Water - 117215467_5cccef9aaa_b.jpg image',  '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 105);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (207, '1985-01-08', 'that is a beautiful flower with great colours ',105, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (208, '1985-01-08', 'Amazing shot..',105, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (209, '1985-01-08', '++Beautiful',105, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (106, '1323769314_fe850cd954_o.jpg', '1323769314_fe850cd954_o.jpg', 'Water - 1323769314_fe850cd954_o.jpg image',  '2009-12-18', 6, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 106);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (196, '1985-01-08', 'Bellísima.!!! saludos.',106, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (107, '205579493_baf0f850d1_o.jpg', '205579493_baf0f850d1_o.jpg', 'Water - 205579493_baf0f850d1_o.jpg image',  '2009-12-18', 6, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 107);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (210, '1985-01-08', 'Amazing shot..',107, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (211, '1985-01-08', 'Perfecft!',107, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (212, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',107, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (197, '1985-01-08', 'Wonderful.',107, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (198, '1985-01-08', 'I Think this is Art!',107, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (199, '1985-01-08', 'Amazing shot..',107, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (200, '1985-01-08', 'Gorgeous! Lovely color!',107, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (108, '2198502835_1644c8fde2_o.jpg', '2198502835_1644c8fde2_o.jpg', 'Water - 2198502835_1644c8fde2_o.jpg image',  '2009-12-18', 6, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 108);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (201, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',108, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (202, '1985-01-08', 'I Think this is Art!',108, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (203, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',108, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (204, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',108, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (109, '2242254221_f2af58e243_o.jpg', '2242254221_f2af58e243_o.jpg', 'Water - 2242254221_f2af58e243_o.jpg image',  '2009-12-18', 6, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 109);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (213, '1985-01-08', 'Beautiful colours. Nice close up. ',109, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (214, '1985-01-08', 'this is extremely Good:) Congratulations!',109, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (215, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',109, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (216, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',109, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (205, '1985-01-08', 'nice shot =) ',109, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (110, '3170219697_4d259ff802_o.jpg', '3170219697_4d259ff802_o.jpg', 'Water - 3170219697_4d259ff802_o.jpg image',  '2009-12-18', 6, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 110);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (217, '1985-01-08', 'Wonderful.',110, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (218, '1985-01-08', 'Wonderful.',110, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (206, '1985-01-08', 'Bellísima.!!! saludos.',110, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (207, '1985-01-08', 'I Think this is Art!',110, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (111, '3200123361_cfd16bb12a_o.jpg', '3200123361_cfd16bb12a_o.jpg', 'Water - 3200123361_cfd16bb12a_o.jpg image',  '2009-12-18', 6, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 111);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (208, '1985-01-08', 'Bellissima macro!',111, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (112, '3253676430_b14ae3f5c9_o.jpg', '3253676430_b14ae3f5c9_o.jpg', 'Water - 3253676430_b14ae3f5c9_o.jpg image',  '2009-12-18', 6, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 112);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (219, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',112, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (220, '1985-01-08', 'Bellísima.!!! saludos.',112, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (221, '1985-01-08', 'Gorgeous! Lovely color!',112, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (222, '1985-01-08', 'that is a beautiful flower with great colours ',112, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (209, '1985-01-08', '++Beautiful',112, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (113, '336589255_6a8ba0ebb6_o.jpg', '336589255_6a8ba0ebb6_o.jpg', 'Water - 336589255_6a8ba0ebb6_o.jpg image',  '2009-12-18', 6, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 113);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (223, '1985-01-08', 'Bellissima macro!',113, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (224, '1985-01-08', 'fantastic shot !!!!!!',113, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (225, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',113, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (210, '1985-01-08', 'Gorgeous! Lovely color!',113, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (211, '1985-01-08', 'I Think this is Art!',113, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (212, '1985-01-08', 'I Think this is Art!',113, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (114, '3411135019_0cc403fcb8_o.jpg', '3411135019_0cc403fcb8_o.jpg', 'Water - 3411135019_0cc403fcb8_o.jpg image',  '2009-12-18', 6, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 114);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (226, '1985-01-08', 'fantastic shot !!!!!!',114, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (213, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',114, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (214, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',114, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (215, '1985-01-08', 'Wonderful.',114, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (115, '3416553183_2564d26ef1_b.jpg', '3416553183_2564d26ef1_b.jpg', 'Water - 3416553183_2564d26ef1_b.jpg image',  '2009-12-18', 6, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 115);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (216, '1985-01-08', 'whoah ! wonderful',115, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (217, '1985-01-08', 'that is a beautiful flower with great colours ',115, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (218, '1985-01-08', 'nice shot =) ',115, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (219, '1985-01-08', 'Perfecft!',115, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (116, '381634787_f52e84a5af_o.jpg', '381634787_f52e84a5af_o.jpg', 'Water - 381634787_f52e84a5af_o.jpg image',  '2009-12-18', 6, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 116);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (227, '1985-01-08', 'Perfecft!',116, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (228, '1985-01-08', 'Bellissima macro!',116, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (229, '1985-01-08', 'I Think this is Art!',116, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (230, '1985-01-08', 'whoah ! wonderful',116, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (117, '396318116_a47c4a8392_o.jpg', '396318116_a47c4a8392_o.jpg', 'Water - 396318116_a47c4a8392_o.jpg image',  '2009-12-18', 6, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 117);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (231, '1985-01-08', 'Bellissima macro!',117, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (232, '1985-01-08', 'Amazing shot..',117, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (220, '1985-01-08', 'that is a beautiful flower with great colours ',117, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (118, '412426470_47be44c1f1_o.jpg', '412426470_47be44c1f1_o.jpg', 'Water - 412426470_47be44c1f1_o.jpg image',  '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 118);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (233, '1985-01-08', 'Perfecft!',118, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (234, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',118, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (235, '1985-01-08', '++Beautiful',118, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (119, '7530427_08dcad5953_o.jpg', '7530427_08dcad5953_o.jpg', 'Water - 7530427_08dcad5953_o.jpg image',  '2009-12-18', 6, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 119);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (236, '1985-01-08', 'Wonderful.',119, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (237, '1985-01-08', 'this is extremely Good:) Congratulations!',119, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (238, '1985-01-08', 'nice shot =) ',119, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (239, '1985-01-08', 'Amazing shot..',119, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (221, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',119, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (222, '1985-01-08', 'Very *lovely*',119, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (120, '767963055_bd02f406d6_o.jpg', '767963055_bd02f406d6_o.jpg', 'Water - 767963055_bd02f406d6_o.jpg image',  '2009-12-18', 6, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 120);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (240, '1985-01-08', 'fantastic shot !!!!!!',120, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (241, '1985-01-08', 'Amazing shot..',120, 3);
 UPDATE albums set coveringimage_image_id=120 where album_id = 6;
 
-
-user_id) VALUES (214, '1985-01-08', 'Very *lovely*',112, 2);
-UPDATE albums set coveringimage_image_id=112 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (113, '336589255_6a8ba0ebb6_o.jpg', '336589255_6a8ba0ebb6_o.jpg', 'Water - 336589255_6a8ba0ebb6_o.jpg image',  '2009-12-18', 6, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 113);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (215, '1985-01-08', 'Such a lovely colour azaga!',113, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (216, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',113, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (217, '1985-01-08', 'Beautiful colours. Nice close up. ',113, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (218, '1985-01-08', 'Amazing shot..',113, 3);
-UPDATE albums set coveringimage_image_id=113 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (114, '3411135019_0cc403fcb8_o.jpg', '3411135019_0cc403fcb8_o.jpg', 'Water - 3411135019_0cc403fcb8_o.jpg image',  '2009-12-18', 6, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 114);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (219, '1985-01-08', 'this is extremely Good:) Congratulations!',114, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (220, '1985-01-08', 'Beautiful colours. Nice close up. ',114, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (221, '1985-01-08', 'this is extremely Good:) Congratulations!',114, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (222, '1985-01-08', 'this is extremely Good:) Congratulations!',114, 2);
-UPDATE albums set coveringimage_image_id=114 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (115, '3416553183_2564d26ef1_b.jpg', '3416553183_2564d26ef1_b.jpg', 'Water - 3416553183_2564d26ef1_b.jpg image',  '2009-12-18', 6, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 115);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (223, '1985-01-08', 'Amazing shot..',115, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (224, '1985-01-08', '++Beautiful',115, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (225, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',115, 1);
-UPDATE albums set coveringimage_image_id=115 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (116, '381634787_f52e84a5af_o.jpg', '381634787_f52e84a5af_o.jpg', 'Water - 381634787_f52e84a5af_o.jpg image',  '2009-12-18', 6, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 116);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (226, '1985-01-08', 'Gorgeous! Lovely color!',116, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (227, '1985-01-08', 'Bellísima.!!! saludos.',116, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (228, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',116, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (229, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',116, 1);
-UPDATE albums set coveringimage_image_id=116 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (117, '396318116_a47c4a8392_o.jpg', '396318116_a47c4a8392_o.jpg', 'Water - 396318116_a47c4a8392_o.jpg image',  '2009-12-18', 6, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 117);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (230, '1985-01-08', 'whoah ! wonderful',117, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (231, '1985-01-08', 'Bellísima.!!! saludos.',117, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (232, '1985-01-08', 'Wonderful.',117, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (233, '1985-01-08', 'this is extremely Good:) Congratulations!',117, 3);
-UPDATE albums set coveringimage_image_id=117 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (118, '412426470_47be44c1f1_o.jpg', '412426470_47be44c1f1_o.jpg', 'Water - 412426470_47be44c1f1_o.jpg image',  '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 118);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (234, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',118, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (235, '1985-01-08', 'Amazing shot..',118, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (236, '1985-01-08', 'that is a beautiful flower with great colours ',118, 1);
-UPDATE albums set coveringimage_image_id=118 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (119, '7530427_08dcad5953_o.jpg', '7530427_08dcad5953_o.jpg', 'Water - 7530427_08dcad5953_o.jpg image',  '2009-12-18', 6, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 119);
-UPDATE albums set coveringimage_image_id=119 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (120, '767963055_bd02f406d6_o.jpg', '767963055_bd02f406d6_o.jpg', 'Water - 767963055_bd02f406d6_o.jpg image',  '2009-12-18', 6, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 120);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (237, '1985-01-08', 'that is a beautiful flower with great colours ',120, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (238, '1985-01-08', 'Gorgeous! Lovely color!',120, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (239, '1985-01-08', 'Bellísima.!!! saludos.',120, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (240, '1985-01-08', 'Very *lovely*',120, 2);
-UPDATE albums set coveringimage_image_id=120 where album_id = 6;
-
-

Modified: trunk/test-applications/realworld2/ejb/sql/short/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/sql/short/import.sql	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/sql/short/import.sql	2009-04-20 17:20:11 UTC (rev 13707)
@@ -13,18 +13,23 @@
 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 comments(comment_id, date, message, image_id, user_id) VALUES (0, '1985-01-08', 'love every thing about this picture, really beautiful... :))',0, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (1, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',0, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (2, '1985-01-08', 'that is a beautiful flower with great colours ',0, 1);
 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 (3, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',1, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (4, '1985-01-08', 'Bellísima.!!! saludos.',1, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (5, '1985-01-08', 'Bellissima macro!',1, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (6, '1985-01-08', 'Gorgeous! Lovely color!',1, 1);
 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 (7, '1985-01-08', 'I Think this is Art!',2, 2);
 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 (8, '1985-01-08', 'Bellísima.!!! saludos.',3, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (9, '1985-01-08', 'fantastic shot !!!!!!',3, 2);
 UPDATE albums set coveringimage_image_id=3 where album_id = 0;
 
 ---------------------------------------------------------------------
@@ -37,17 +42,15 @@
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 4);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (5, '1941230817_bcce17b8ef_o.jpg', '1941230817_bcce17b8ef_o.jpg', 'Cars - 1941230817_bcce17b8ef_o.jpg image',  '2009-12-18', 1, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 5);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (5, '1985-01-08', 'that is a beautiful flower with great colours ',5, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (6, '1985-01-08', 'this is extremely Good:) Congratulations!',5, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (7, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',5, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (8, '1985-01-08', 'Such a lovely colour azaga!',5, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (10, '1985-01-08', 'fantastic shot !!!!!!',5, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (6, '2151423750_129317a034_o.jpg', '2151423750_129317a034_o.jpg', 'Cars - 2151423750_129317a034_o.jpg image',  '2009-12-18', 1, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 6);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (9, '1985-01-08', 'love every thing about this picture, really beautiful... :))',6, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (11, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',6, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (12, '1985-01-08', 'Very *lovely*',6, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (7, '2233985073_9a3fd7d3ac_b.jpg', '2233985073_9a3fd7d3ac_b.jpg', 'Cars - 2233985073_9a3fd7d3ac_b.jpg image',  '2009-12-18', 1, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1, 7);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (10, '1985-01-08', '++Beautiful',7, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (11, '1985-01-08', '++Beautiful',7, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (13, '1985-01-08', 'whoah ! wonderful',7, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (14, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',7, 1);
 UPDATE albums set coveringimage_image_id=7 where album_id = 1;
 
 ---------------------------------------------------------------------
@@ -58,24 +61,16 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (8, '05[303x457].jpg', '05[303x457].jpg', 'Monuments and just buildings - 05[303x457].jpg image',  '2009-12-18', 2, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 8);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (12, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',8, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (13, '1985-01-08', 'Bellissima macro!',8, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (14, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',8, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (9, '07[303x457].jpg', '07[303x457].jpg', 'Monuments and just buildings - 07[303x457].jpg image',  '2009-12-18', 2, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 9);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (15, '1985-01-08', 'nice shot =) ',9, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (16, '1985-01-08', 'Perfecft!',9, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (17, '1985-01-08', 'fantastic shot !!!!!!',9, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (15, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',9, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (10, '1805365000_ca64d20b10_o.jpg', '1805365000_ca64d20b10_o.jpg', 'Monuments and just buildings - 1805365000_ca64d20b10_o.jpg image',  '2009-12-18', 2, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 10);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (18, '1985-01-08', 'Very *lovely*',10, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (19, '1985-01-08', 'whoah ! wonderful',10, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (20, '1985-01-08', 'this is extremely Good:) Congratulations!',10, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (21, '1985-01-08', 'Perfecft!',10, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (16, '1985-01-08', 'Amazing shot..',10, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (11, '1[303x457].jpg', '1[303x457].jpg', 'Monuments and just buildings - 1[303x457].jpg image',  '2009-12-18', 2, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2, 11);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (22, '1985-01-08', 'nice shot =) ',11, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (23, '1985-01-08', 'that is a beautiful flower with great colours ',11, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (17, '1985-01-08', 'Stunning capture! :-)',11, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (18, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',11, 3);
 UPDATE albums set coveringimage_image_id=11 where album_id = 2;
 
 ---------------------------------------------------------------------
@@ -86,23 +81,19 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (12, '01[303x202].jpg', '01[303x202].jpg', 'Nature - 01[303x202].jpg image',  '2009-12-18', 3, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 12);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (24, '1985-01-08', 'Bellissima macro!',12, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (25, '1985-01-08', 'that is a beautiful flower with great colours ',12, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (26, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',12, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (19, '1985-01-08', 'Bellissima macro!',12, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (20, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',12, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (21, '1985-01-08', 'Bellísima.!!! saludos.',12, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (13, '1[305x457].jpg', '1[305x457].jpg', 'Nature - 1[305x457].jpg image',  '2009-12-18', 3, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 13);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (27, '1985-01-08', 'Bellissima macro!',13, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (28, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',13, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (29, '1985-01-08', 'fantastic shot !!!!!!',13, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (30, '1985-01-08', 'Bellísima.!!! saludos.',13, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (22, '1985-01-08', 'that is a beautiful flower with great colours ',13, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (23, '1985-01-08', 'Wonderful.',13, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (14, '273927725_c9f5ef5952_o.jpg', '273927725_c9f5ef5952_o.jpg', 'Nature - 273927725_c9f5ef5952_o.jpg image',  '2009-12-18', 3, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 14);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (24, '1985-01-08', 'Gorgeous! Lovely color!',14, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (15, '2[303x457].jpg', '2[303x457].jpg', 'Nature - 2[303x457].jpg image',  '2009-12-18', 3, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3, 15);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (31, '1985-01-08', 'love every thing about this picture, really beautiful... :))',15, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (32, '1985-01-08', 'Very *lovely*',15, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (33, '1985-01-08', 'love every thing about this picture, really beautiful... :))',15, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (34, '1985-01-08', 'Amazing shot..',15, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (25, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',15, 3);
 UPDATE albums set coveringimage_image_id=15 where album_id = 3;
 
 ---------------------------------------------------------------------
@@ -113,21 +104,18 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (16, '02[303x202].jpg', '02[303x202].jpg', 'Portrait - 02[303x202].jpg image',  '2009-12-18', 4, 'Nikon D60', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 16);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (35, '1985-01-08', 'Such a lovely colour azaga!',16, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (36, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',16, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (26, '1985-01-08', 'fantastic shot !!!!!!',16, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (27, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',16, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (28, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',16, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (29, '1985-01-08', 'Wonderful.',16, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (17, '1033975999_7e058fcf1c_o.jpg', '1033975999_7e058fcf1c_o.jpg', 'Portrait - 1033975999_7e058fcf1c_o.jpg image',  '2009-12-18', 4, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 17);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (37, '1985-01-08', 'whoah ! wonderful',17, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (38, '1985-01-08', 'fantastic shot !!!!!!',17, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (39, '1985-01-08', 'Such a lovely colour azaga!',17, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (30, '1985-01-08', 'I Think this is Art!',17, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (18, '1516027705_ddff0a70dd_o.jpg', '1516027705_ddff0a70dd_o.jpg', 'Portrait - 1516027705_ddff0a70dd_o.jpg image',  '2009-12-18', 4, 'Canon Digital IXUS 80 IS (PowerShot SD1100 IS)', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 18);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (40, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',18, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (41, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',18, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (42, '1985-01-08', 'Amazing shot..',18, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (43, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',18, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (19, '1799039821_b6ee53167c_o.jpg', '1799039821_b6ee53167c_o.jpg', 'Portrait - 1799039821_b6ee53167c_o.jpg image',  '2009-12-18', 4, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4, 19);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (31, '1985-01-08', 'Bellísima.!!! saludos.',19, 2);
 UPDATE albums set coveringimage_image_id=19 where album_id = 4;
 
 ---------------------------------------------------------------------
@@ -138,25 +126,22 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (20, '103193233_860c47c909_o.jpg', '103193233_860c47c909_o.jpg', 'Sport - 103193233_860c47c909_o.jpg image',  '2009-12-18', 5, 'Olympus Stylus mju 1040', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 20);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (44, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',20, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (45, '1985-01-08', 'love every thing about this picture, really beautiful... :))',20, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (46, '1985-01-08', 'Perfecft!',20, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (47, '1985-01-08', 'whoah ! wonderful',20, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (32, '1985-01-08', 'this is extremely Good:) Congratulations!',20, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (33, '1985-01-08', 'whoah ! wonderful',20, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (34, '1985-01-08', 'nice shot =) ',20, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (35, '1985-01-08', 'Such a lovely colour azaga!',20, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (21, '1350250361_2d963dd4e7_o.jpg', '1350250361_2d963dd4e7_o.jpg', 'Sport - 1350250361_2d963dd4e7_o.jpg image',  '2009-12-18', 5, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 21);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (48, '1985-01-08', 'Beautiful colours. Nice close up. ',21, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (49, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',21, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (50, '1985-01-08', 'Beautiful colours. Nice close up. ',21, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (51, '1985-01-08', 'Beautiful ^Flower^...great Macro....Excellent !!!',21, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (36, '1985-01-08', 'nice shot =) ',21, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (37, '1985-01-08', 'Stunning capture! :-)',21, 2);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (22, '2042654579_d25c0db64f_o.jpg', '2042654579_d25c0db64f_o.jpg', 'Sport - 2042654579_d25c0db64f_o.jpg image',  '2009-12-18', 5, 'BenQ DC E800', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 22);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (52, '1985-01-08', 'Such a lovely colour azaga!',22, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (53, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',22, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (54, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',22, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (38, '1985-01-08', 'nice shot =) ',22, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (39, '1985-01-08', 'Beautiful colours. Nice close up. ',22, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (23, '2158910844_e5a6deeeab_o.jpg', '2158910844_e5a6deeeab_o.jpg', 'Sport - 2158910844_e5a6deeeab_o.jpg image',  '2009-12-18', 5, 'Konica Minolta', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5, 23);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (55, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',23, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (56, '1985-01-08', 'love every thing about this picture, really beautiful... :))',23, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (40, '1985-01-08', 'fantastic shot !!!!!!',23, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (41, '1985-01-08', 'Amazing shot..',23, 2);
 UPDATE albums set coveringimage_image_id=23 where album_id = 5;
 
 ---------------------------------------------------------------------
@@ -167,33 +152,18 @@
 
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (24, '117215467_5cccef9aaa_b.jpg', '117215467_5cccef9aaa_b.jpg', 'Water - 117215467_5cccef9aaa_b.jpg image',  '2009-12-18', 6, 'Panasonic', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 24);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (57, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',24, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (58, '1985-01-08', 'nice shot =) ',24, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (42, '1985-01-08', 'Very *lovely*',24, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (43, '1985-01-08', 'whoah ! wonderful',24, 3);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (25, '1323769314_fe850cd954_o.jpg', '1323769314_fe850cd954_o.jpg', 'Water - 1323769314_fe850cd954_o.jpg image',  '2009-12-18', 6, 'LG LDC-A310', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 25);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (59, '1985-01-08', 'Gorgeous! Lovely color!',25, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (60, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',25, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (61, '1985-01-08', '++Beautiful',25, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (62, '1985-01-08', 'that is a beautiful flower with great colours ',25, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (26, '205579493_baf0f850d1_o.jpg', '205579493_baf0f850d1_o.jpg', 'Water - 205579493_baf0f850d1_o.jpg image',  '2009-12-18', 6, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 26);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (63, '1985-01-08', 'Amazing shot..',26, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (64, '1985-01-08', 'Fantastic job. Great light and color! Great shot!',26, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (44, '1985-01-08', 'Wow!! Macro stupenda!!! Complimenti! ',26, 2);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (45, '1985-01-08', '++Beautiful',26, 3);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (46, '1985-01-08', 'Amazing shot..',26, 1);
+  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (47, '1985-01-08', 'Superb Shot and so beautiful Colors !!! ',26, 1);
 INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (27, '2198502835_1644c8fde2_o.jpg', '2198502835_1644c8fde2_o.jpg', 'Water - 2198502835_1644c8fde2_o.jpg image',  '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
   INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 27);
 UPDATE albums set coveringimage_image_id=27 where album_id = 6;
 
 
- INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (26, '205579493_baf0f850d1_o.jpg', '205579493_baf0f850d1_o.jpg', 'Water - 205579493_baf0f850d1_o.jpg image',  '2009-12-18', 6, 'Canon EOS 450D', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 26);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (65, '1985-01-08', 'nice shot =) ',26, 3);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (66, '1985-01-08', 'Bellissima macro!',26, 1);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (67, '1985-01-08', 'I Think this is Art!',26, 2);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (68, '1985-01-08', '|Wonderful| coloured flower .... *excellent* macro .... -nice- details!!!',26, 1);
-UPDATE albums set coveringimage_image_id=26 where album_id = 6;
-INSERT INTO images(image_id, name, path, description, created, album_id,  cameraModel, width, size, height, uploaded, allowComments, showMetaInfo) VALUES (27, '2198502835_1644c8fde2_o.jpg', '2198502835_1644c8fde2_o.jpg', 'Water - 2198502835_1644c8fde2_o.jpg image',  '2009-12-18', 6, 'Sony CyberShot DSC-T77', 1024, 1917, 768, '2009-12-01', true, true);
-  INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6, 27);
-  INSERT INTO comments(comment_id, date, message, image_id, user_id) VALUES (69, '1985-01-08', 'really pretty. it looks like there is a lady in the _center_, blowing kisses!!',27, 3);
-UPDATE albums set coveringimage_image_id=27 where album_id = 6;
-
-

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/photoalbum/service/AlbumAction.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/AlbumAction.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -45,9 +45,9 @@
 	/**
      * Persist album entity to database
      * @param album - album to add
-	 * @throws RealworldException 
+	 * @throws PhotoAlbumException
      */
-	public void addAlbum(Album album) throws RealworldException {
+	public void addAlbum(Album album) throws PhotoAlbumException {
 		try{
 		em.persist(album);
 		//Add to shelf
@@ -55,16 +55,16 @@
 		em.flush();
 		}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
 	}
 	
 	/**
      * Remove album entity from database
      * @param album - album to delete
-	 * @throws RealworldException 
+	 * @throws PhotoAlbumException
      */
-	public void deleteAlbum(Album album) throws RealworldException{
+	public void deleteAlbum(Album album) throws PhotoAlbumException {
 		try{
 		if(album.getShelf() == null){
 			return;
@@ -75,21 +75,21 @@
 		em.flush();
 		}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
 	}
 	
 	/**
      * Synchronize state of album entity with database
      * @param album - album to Synchronize
-	 * @throws RealworldException 
+	 * @throws PhotoAlbumException
      */
-	public void editAlbum(Album album) throws RealworldException{
+	public void editAlbum(Album album) throws PhotoAlbumException {
 		try{
 		em.flush();
 		}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
 	}
 }

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/photoalbum/service/Constants.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -127,7 +127,7 @@
 	public static final String TEMP_DIR = "java.io.tmpdir";
 	public static final String WEB_INF = "WEB-INF";
 	public static final String IMAGE_FOLDER = "/Upload";
-	public static final String REALWORLD_FOLDER = "richfaces_realworld";
+	public static final String PHOTOALBUM_FOLDER = "richfaces_photoalbum";
 
 	//Service -constants
 	public static final String USER_EXIST_QUERY = "user-exist";

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/photoalbum/service/IAlbumAction.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IAlbumAction.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -33,10 +33,10 @@
 @Local
 public interface IAlbumAction {
 
-	void addAlbum(Album album) throws RealworldException;
+	void addAlbum(Album album) throws PhotoAlbumException;
 	
-	void deleteAlbum(Album album) throws RealworldException;
+	void deleteAlbum(Album album) throws PhotoAlbumException;
 	
-	void editAlbum(Album album) throws RealworldException;
+	void editAlbum(Album album) throws PhotoAlbumException;
 
 }
\ No newline at end of file

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/photoalbum/service/IImageAction.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IImageAction.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -37,15 +37,15 @@
 @Local
 public interface IImageAction {
 
-	public void deleteImage(Image image) throws RealworldException;
+	public void deleteImage(Image image) throws PhotoAlbumException;
 
-	public void editImage(Image image, boolean metatagsChanged) throws RealworldException;
+	public void editImage(Image image, boolean metatagsChanged) throws PhotoAlbumException;
 
-	public void addImage(Image image) throws RealworldException;
+	public void addImage(Image image) throws PhotoAlbumException;
 	
-	public void deleteComment(Comment comment) throws RealworldException;
+	public void deleteComment(Comment comment) throws PhotoAlbumException;
 	
-	public void addComment(Comment comment) throws RealworldException;
+	public void addComment(Comment comment) throws PhotoAlbumException;
 
 	public MetaTag getTagByName(String tag);
 

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/photoalbum/service/IShelfAction.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IShelfAction.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -36,11 +36,11 @@
 @Local
 public interface IShelfAction {
 
-	void addShelf(Shelf shelf) throws RealworldException;
+	void addShelf(Shelf shelf) throws PhotoAlbumException;
 	
-	void deleteShelf(Shelf shelf) throws RealworldException;
+	void deleteShelf(Shelf shelf) throws PhotoAlbumException;
 	
-	void editShelf(Shelf shelf) throws RealworldException;
+	void editShelf(Shelf shelf) throws PhotoAlbumException;
 	
 	List<Shelf> getPredefinedShelves(User user);
 }

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/photoalbum/service/IUserAction.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/IUserAction.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -33,7 +33,7 @@
 @Local
 public interface IUserAction {
 	public User login(String username, String password);
-	public void register(User user) throws RealworldException;
+	public void register(User user) throws PhotoAlbumException;
 	public boolean isUserExist(String login) ;
-	public User updateUser() throws RealworldException;
+	public User updateUser() throws PhotoAlbumException;
 }
\ No newline at end of file

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/photoalbum/service/ImageAction.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ImageAction.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -52,9 +52,9 @@
     /**
      * Remove image entity from database
      * @param image - image to delete
-     * @throws RealworldException 
+     * @throws PhotoAlbumException
      */
-    public void deleteImage(Image image) throws RealworldException {
+    public void deleteImage(Image image) throws PhotoAlbumException {
     	try{
     	if(image.getAlbum().getCoveringImage().equals(image)){
     		image.getAlbum().setCoveringImage(null);
@@ -64,7 +64,7 @@
         em.flush();
     	}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
     }
 
@@ -72,9 +72,9 @@
      * Synchronize state of image entity with database
      * @param image - image to Synchronize
      * @param metatagsChanged - boolean value, that indicates is metatags of this image were changed(add new or delete older)
-     * @throws RealworldException 
+     * @throws PhotoAlbumException
      */
-    public void editImage(Image image, boolean metatagsChanged) throws RealworldException {
+    public void editImage(Image image, boolean metatagsChanged) throws PhotoAlbumException {
     	try{
     	if(metatagsChanged){
     		//Create cash of metatags early associated with image
@@ -129,55 +129,55 @@
         em.flush();
     	}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
     }
 
     /**
      * Persist image entity to database
      * @param image - image to add
-     * @throws RealworldException 
+     * @throws PhotoAlbumException
      */
-    public void addImage(Image image) throws RealworldException {
+    public void addImage(Image image) throws PhotoAlbumException {
     	try{
     		 em.persist(image);
     	     image.getAlbum().addImage(image);
     	     em.flush();
     	}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
     }
 
     /**
      * Remove comment from image
      * @param comment - comment to remove
-     * @throws RealworldException 
+     * @throws PhotoAlbumException
      */
-    public void deleteComment(Comment comment) throws RealworldException {
+    public void deleteComment(Comment comment) throws PhotoAlbumException {
     	try{
     		em.remove(comment);
     		comment.getImage().removeComment(comment);
     		em.flush();
     	}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
     }
 
     /**
      * Add comment from image
      * @param comment - comment to add
-     * @throws RealworldException 
+     * @throws PhotoAlbumException
      */
-    public void addComment(Comment comment) throws RealworldException {
+    public void addComment(Comment comment) throws PhotoAlbumException {
     	try{
     		comment.getImage().addComment(comment);
     		em.persist(comment);
     		em.flush();
     	}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
     }
 

Copied: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/PhotoAlbumException.java (from rev 13672, 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/PhotoAlbumException.java	                        (rev 0)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/PhotoAlbumException.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -0,0 +1,21 @@
+package org.richfaces.photoalbum.service;
+
+import javax.ejb.ApplicationException;
+
+ at ApplicationException(rollback = false)
+public class PhotoAlbumException extends Exception {
+
+	private static final long serialVersionUID = -305899531752889504L;
+
+	public PhotoAlbumException() {
+		super();
+	}
+
+	public PhotoAlbumException(String message) {
+		super(message);
+	}
+
+	public PhotoAlbumException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}


Property changes on: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/PhotoAlbumException.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Id Revision Date
Name: svn:eol-style
   + native

Deleted: 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/RealworldException.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/RealworldException.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -1,21 +0,0 @@
-package org.richfaces.photoalbum.service;
-
-import javax.ejb.ApplicationException;
-
- at ApplicationException(rollback = false)
-public class RealworldException extends Exception {
-
-	private static final long serialVersionUID = -305899531752889504L;
-
-	public RealworldException() {
-		super();
-	}
-
-	public RealworldException(String message) {
-		super(message);
-	}
-
-	public RealworldException(String message, Throwable cause) {
-		super(message, cause);
-	}
-}

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/photoalbum/service/ShelfAction.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/ShelfAction.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -52,9 +52,9 @@
 	/**
      * Persist shelf entity to database
      * @param shelf - shelf to add
-	 * @throws RealworldException 
+	 * @throws PhotoAlbumException
      */
-	public void addShelf(Shelf shelf) throws RealworldException {
+	public void addShelf(Shelf shelf) throws PhotoAlbumException {
 		try{
 		em.persist(shelf);
 		//Add reference to user
@@ -62,16 +62,16 @@
 		em.flush();
 		}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
 	}
 
 	/**
      * Remove shelf entity from database
      * @param shelf - shelf to delete
-	 * @throws RealworldException 
+	 * @throws PhotoAlbumException
      */
-	public void deleteShelf(Shelf shelf) throws RealworldException {
+	public void deleteShelf(Shelf shelf) throws PhotoAlbumException {
 		try{
 			//Remove reference from user
 		user.removeShelf(shelf);
@@ -79,21 +79,21 @@
 		em.flush();
 		}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
 	}
 
 	/**
      * Synchronize state of shelf entity with database
      * @param shelf - shelf to Synchronize
-	 * @throws RealworldException 
+	 * @throws PhotoAlbumException
      */
-	public void editShelf(Shelf shelf) throws RealworldException {
+	public void editShelf(Shelf shelf) throws PhotoAlbumException {
 		try{
 		em.flush();
 		}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
 	}
 

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/photoalbum/service/UserAction.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/photoalbum/service/UserAction.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -61,29 +61,29 @@
 	/**
      * Persist user entity to database
      * @param user - user to register
-	 * @throws RealworldException 
+	 * @throws PhotoAlbumException
      */
-	public void register(User user) throws RealworldException {
+	public void register(User user) throws PhotoAlbumException {
 		try{
 		em.persist(user);
 		em.flush();
 		}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
 	}
 	
 	/**
      * Synchronize state of user entity with database
      * @return user if success
-	 * @throws RealworldException 
+	 * @throws PhotoAlbumException
      */
-	public User updateUser() throws RealworldException {
+	public User updateUser() throws PhotoAlbumException {
 		try{
 		em.flush();
 		}
         catch(Exception e){
-        	throw new RealworldException(e.getMessage());
+        	throw new PhotoAlbumException(e.getMessage());
         }
 		return user;
 	}

Modified: trunk/test-applications/realworld2/ejb/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/META-INF/persistence.xml	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/META-INF/persistence.xml	2009-04-20 17:20:11 UTC (rev 13707)
@@ -7,14 +7,14 @@
              
    <persistence-unit name="entityManager" transaction-type="JTA">
       <provider>org.hibernate.ejb.HibernatePersistence</provider>
-      <jta-data-source>java:/realWorldDatasource</jta-data-source>
+      <jta-data-source>java:/photoalbumDatasource</jta-data-source>
         <properties>
          <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
          <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
          <property name="hibernate.show_sql" value="true"/>
          <property name="hibernate.format_sql" value="true"/>
          <property name="jboss.entity.manager.factory.jndi.name" 
-          value="java:/realWorldEntityManager"/>
+          value="java:/photoalbumEntityManager"/>
           <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
       </properties>
       <!--<properties>
@@ -24,7 +24,7 @@
          <property name="hibernate.format_sql" value="true"/>
          <property name="hibernate.format_sql" value="true"/>
          <property name="jboss.entity.manager.factory.jndi.name" 
-          value="java:/realWorldEntityManager"/>
+          value="java:/photoalbumEntityManager"/>
           <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
       </properties>-->
    </persistence-unit>

Modified: trunk/test-applications/realworld2/ejb/src/main/resources/components.properties
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/components.properties	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/components.properties	2009-04-20 17:20:11 UTC (rev 13707)
@@ -1,4 +1,4 @@
 #
 #Mon Sep 15 14:29:32 EEST 2008
-jndiPattern=realworld-ear-1.0-SNAPSHOT/#{ejbName}/local
+jndiPattern=photoalbum-ear-1.0-SNAPSHOT/#{ejbName}/local
 embeddedEjb=false

Modified: trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/photoalbum-ds.xml	2009-04-20 17:20:11 UTC (rev 13707)
@@ -6,12 +6,12 @@
     
 <datasources>
    <local-tx-datasource>
-      <jndi-name>realWorldDatasource</jndi-name>
+      <jndi-name>photoalbumDatasource</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: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>

Copied: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/PhotoAlbumHelper.java (from rev 13672, trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java)
===================================================================
--- trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/PhotoAlbumHelper.java	                        (rev 0)
+++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/PhotoAlbumHelper.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -0,0 +1,207 @@
+/**
+ * 
+ */
+package org.richfaces.photoalbum;
+
+import org.testng.Assert;
+
+import com.thoughtworks.selenium.Selenium;
+
+/**
+ * @author Andrey Markavtsov
+ *
+ */
+public class PhotoAlbumHelper {
+	
+		
+    private static final String WINDOW_JS_RESOLVER = "selenium.browserbot.getCurrentWindow().";
+    private static final String STATUS_START_ID = "_viewRoot:status.start";
+    private static final int TIMEOUT = 20000;
+    
+    public static interface UserInfoConstants {
+		String LOGIN_NAME = "amarkhel";
+		String LOGIN_PASSWORD = "12345";
+    }
+    
+    public static interface HtmlConstants {
+    	
+		public static interface IndexPage {
+			String MAIN_FORM_ID = "mainform";
+			//String shelfCountPath = "//table[@id='menuform:menu']/tbody/tr/td[2]";
+			//int SHELF_COUNT = 2;
+		}
+		
+		public static interface LoginPage {
+			String LOGIN_FORM_ID = "loginPanelForm";
+			String usernameId = LOGIN_FORM_ID + ":username";
+			String passwordId = LOGIN_FORM_ID + ":password";
+			String loginButtonPath= "//*[@class='login-table-col']//*[@type='image']";
+			
+		}
+		
+		public static interface LogInOutArea {
+			String LOGIN_LINK_ID = "loginPanelShowlink";
+			String LOGOUT_LINK_PATH = "//*[@id='logInOutMenu']//div/a";
+			String USER_INFO_LINK_PATH = "//a[@class='logged-user']";
+		}
+		
+		public static interface ToolBarArea {
+			String TOOLBAR_PATH = "//*[@class='dr-toolbar-int rich-toolbar-item main-menu-toolbar-content']";
+			String VIEW_SHELFS_PATH = TOOLBAR_PATH + "/div[2]";
+			String VIEW_ALBUMS_PATH = TOOLBAR_PATH + "/div[3]";
+			String VIEW_IMAGES_PATH = TOOLBAR_PATH + "/div[4]";
+			String ADD_IMAGE_LINK_PATH = TOOLBAR_PATH + "/*[@id='menuform:add_icons_div_id']/a[3]";
+		}
+		
+		public static interface ShelfArea {
+			String HEADER_PATH = "//*[@class='shelf-header-table']";
+			String SHELF_NAME_PATH = HEADER_PATH + "//h1";
+			String ALBUM_PATH = "//*[@class='preview_box_album_120']";
+			String ALBUM_LINK_PATH = ALBUM_PATH + "//a";
+			String ALBUM_NAME_PATH = ALBUM_PATH + "/*[@class='album_name']";
+		}
+		
+		public static interface AlbumArea {
+			String HEADER_PATH = "//*[@class='album-header-table']";
+			String ALBUM_NAME_PATH = HEADER_PATH + "//h1";
+			String IMAGE_PATH = "//*[@class='preview_box_photo_120']";
+			String IMAGE_LINK_PATH = IMAGE_PATH + "//a";
+			String IMAGE_NAME_PATH = IMAGE_PATH + "/*[@class='photo_name']";
+			//String IMAGES_CONTAINER = "//span[@id='mainform:userAlbumImages']";
+		}
+		
+		public static interface ImageArea {
+			String HEADER_PATH = "//*[@class='image-header-table']";
+			String IMAGE_NAME_PATH = HEADER_PATH + "//h1";
+		}
+		
+		public static interface UserProfileArea {
+			String NAME_INPUT_ID = IndexPage.MAIN_FORM_ID + ":loginName";
+		}
+		
+		public static interface FilesUploadArea {
+			String FILE_UPLOAD_ID = IndexPage.MAIN_FORM_ID + ":fileUpload";
+		}
+		
+		public static interface TreeArea {
+			
+		}
+	}
+
+	
+	public static void login(Selenium selenium) {
+		selenium.click(HtmlConstants.LogInOutArea.LOGIN_LINK_ID);
+		try {
+			Thread.sleep(5000);
+		}catch (Exception e) {
+			Assert.fail("Test failed caused by: " + e);
+		}
+		
+		Assert.assertTrue(selenium.isVisible(HtmlConstants.LoginPage.usernameId), "Input for username in not visible");
+		Assert.assertTrue(selenium.isVisible(HtmlConstants.LoginPage.passwordId), "Input for password in not visible");
+		
+		String type = selenium.getAttribute("//*[@id='"+HtmlConstants.LoginPage.passwordId+"']/@type");
+		if (!"password".equals(type)) {
+			Assert.fail("Password input should be of 'password' type");
+		}
+		
+		selenium.type(HtmlConstants.LoginPage.usernameId, UserInfoConstants.LOGIN_NAME);
+		selenium.type(HtmlConstants.LoginPage.passwordId, UserInfoConstants.LOGIN_PASSWORD);
+		
+		selenium.click(HtmlConstants.LoginPage.loginButtonPath);
+		selenium.waitForPageToLoad("10000");
+		
+		if (!isLogined(selenium, UserInfoConstants.LOGIN_NAME)) {
+			Assert.fail("Authentication was not succesfull. Logged user text should contain typed login name");
+		}
+
+	}
+	
+	public static void logout(Selenium selenium) {
+		selenium.click(HtmlConstants.LogInOutArea.LOGOUT_LINK_PATH);
+		selenium.waitForPageToLoad(String.valueOf(TIMEOUT));
+		Assert.assertFalse(isLogined(selenium), "Logout was not succesfull.");
+	}
+	
+	public static void testUserProfile(Selenium selenium) {
+		String name = selenium.getValue(HtmlConstants.UserProfileArea.NAME_INPUT_ID);
+		Assert.assertEquals(name, UserInfoConstants.LOGIN_NAME);
+	}
+	
+	public static void testFilesUpload(Selenium selenium) {
+		Assert.assertTrue(selenium.isVisible(HtmlConstants.FilesUploadArea.FILE_UPLOAD_ID));
+	}
+	
+	public static void testShelfArea(Selenium selenium) {
+		testShelfArea(selenium, null);
+	}
+
+	public static void testShelfArea(Selenium selenium, String shelfName) {
+		Assert.assertTrue(selenium.isVisible(HtmlConstants.ShelfArea.HEADER_PATH));
+		if (shelfName != null) {
+			String text = selenium.getText(PhotoAlbumHelper.HtmlConstants.ShelfArea.SHELF_NAME_PATH);
+			Assert.assertTrue(text.contains(shelfName), "Incorrect data was opened after click by album");
+		}
+	}
+	
+	public static void openAlbumFromShelfArea(Selenium selenium) {		
+		String albumName = selenium.getText(PhotoAlbumHelper.HtmlConstants.ShelfArea.ALBUM_NAME_PATH);
+		
+		selenium.click(PhotoAlbumHelper.HtmlConstants.ShelfArea.ALBUM_LINK_PATH);
+		waitForAjaxCompletion(selenium);
+		
+		testAlbumArea(selenium, albumName);
+	}
+	
+	public static void testAlbumArea(Selenium selenium) {
+		testAlbumArea(selenium, null);
+	}
+
+	public static void testAlbumArea(Selenium selenium, String albumName) {
+		Assert.assertTrue(selenium.isVisible(HtmlConstants.AlbumArea.HEADER_PATH));
+		if (albumName != null) {
+			String text = selenium.getText(PhotoAlbumHelper.HtmlConstants.AlbumArea.ALBUM_NAME_PATH);
+			Assert.assertTrue(text.contains(albumName), "Incorrect data was opened after click by album");
+		}
+	}
+	
+	public static void openImageFromAlbumArea(Selenium selenium) {		
+		String imageName = selenium.getText(PhotoAlbumHelper.HtmlConstants.AlbumArea.IMAGE_NAME_PATH);
+		
+		selenium.click(PhotoAlbumHelper.HtmlConstants.AlbumArea.IMAGE_LINK_PATH);
+		waitForAjaxCompletion(selenium);
+		
+		testImageArea(selenium, imageName);
+	}
+		
+	public static void testImageArea(Selenium selenium) {
+		testImageArea(selenium, null);
+	}
+	
+	public static void testImageArea(Selenium selenium, String imageName) {
+		Assert.assertTrue(selenium.isVisible(HtmlConstants.ImageArea.HEADER_PATH));
+		if (imageName != null) {
+			String text = selenium.getText(PhotoAlbumHelper.HtmlConstants.ImageArea.IMAGE_NAME_PATH);
+			Assert.assertTrue(text.contains(imageName), "Incorrect data was opened after click by image");
+		}
+	}
+
+	public static void waitForAjaxCompletion(Selenium selenium) {
+		waitForAjaxCompletion(selenium, TIMEOUT);
+    }
+    public static void waitForAjaxCompletion(Selenium selenium, int miliseconds) {
+        selenium.waitForCondition(WINDOW_JS_RESOLVER + "document.getElementById('" + STATUS_START_ID + "').style.display == 'none'", String.valueOf(miliseconds));
+    }
+    
+    public static boolean isLogined(Selenium selenium) {
+    	return isLogined(selenium, null);
+    }
+
+    public static boolean isLogined(Selenium selenium, String name) {
+    	boolean logined = !selenium.getXpathCount(HtmlConstants.LogInOutArea.USER_INFO_LINK_PATH).equals(0);
+    	if (logined && name != null) {
+    		logined = selenium.getText(HtmlConstants.LogInOutArea.USER_INFO_LINK_PATH).contains(name);
+    	}
+    	return logined;    	
+    }
+}

Deleted: trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java
===================================================================
--- trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -1,207 +0,0 @@
-/**
- * 
- */
-package org.richfaces.photoalbum;
-
-import org.testng.Assert;
-
-import com.thoughtworks.selenium.Selenium;
-
-/**
- * @author Andrey Markavtsov
- *
- */
-public class RealWorldHelper {
-	
-		
-    private static final String WINDOW_JS_RESOLVER = "selenium.browserbot.getCurrentWindow().";
-    private static final String STATUS_START_ID = "_viewRoot:status.start";
-    private static final int TIMEOUT = 20000;
-    
-    public static interface UserInfoConstants {
-		String LOGIN_NAME = "amarkhel";
-		String LOGIN_PASSWORD = "12345";
-    }
-    
-    public static interface HtmlConstants {
-    	
-		public static interface IndexPage {
-			String MAIN_FORM_ID = "mainform";
-			//String shelfCountPath = "//table[@id='menuform:menu']/tbody/tr/td[2]";
-			//int SHELF_COUNT = 2;
-		}
-		
-		public static interface LoginPage {
-			String LOGIN_FORM_ID = "loginPanelForm";
-			String usernameId = LOGIN_FORM_ID + ":username";
-			String passwordId = LOGIN_FORM_ID + ":password";
-			String loginButtonPath= "//*[@class='login-table-col']//*[@type='image']";
-			
-		}
-		
-		public static interface LogInOutArea {
-			String LOGIN_LINK_ID = "loginPanelShowlink";
-			String LOGOUT_LINK_PATH = "//*[@id='logInOutMenu']//div/a";
-			String USER_INFO_LINK_PATH = "//a[@class='logged-user']";
-		}
-		
-		public static interface ToolBarArea {
-			String TOOLBAR_PATH = "//*[@class='dr-toolbar-int rich-toolbar-item main-menu-toolbar-content']";
-			String VIEW_SHELFS_PATH = TOOLBAR_PATH + "/div[2]";
-			String VIEW_ALBUMS_PATH = TOOLBAR_PATH + "/div[3]";
-			String VIEW_IMAGES_PATH = TOOLBAR_PATH + "/div[4]";
-			String ADD_IMAGE_LINK_PATH = TOOLBAR_PATH + "/*[@id='menuform:add_icons_div_id']/a[3]";
-		}
-		
-		public static interface ShelfArea {
-			String HEADER_PATH = "//*[@class='shelf-header-table']";
-			String SHELF_NAME_PATH = HEADER_PATH + "//h1";
-			String ALBUM_PATH = "//*[@class='preview_box_album_120']";
-			String ALBUM_LINK_PATH = ALBUM_PATH + "//a";
-			String ALBUM_NAME_PATH = ALBUM_PATH + "/*[@class='album_name']";
-		}
-		
-		public static interface AlbumArea {
-			String HEADER_PATH = "//*[@class='album-header-table']";
-			String ALBUM_NAME_PATH = HEADER_PATH + "//h1";
-			String IMAGE_PATH = "//*[@class='preview_box_photo_120']";
-			String IMAGE_LINK_PATH = IMAGE_PATH + "//a";
-			String IMAGE_NAME_PATH = IMAGE_PATH + "/*[@class='photo_name']";
-			//String IMAGES_CONTAINER = "//span[@id='mainform:userAlbumImages']";
-		}
-		
-		public static interface ImageArea {
-			String HEADER_PATH = "//*[@class='image-header-table']";
-			String IMAGE_NAME_PATH = HEADER_PATH + "//h1";
-		}
-		
-		public static interface UserProfileArea {
-			String NAME_INPUT_ID = IndexPage.MAIN_FORM_ID + ":loginName";
-		}
-		
-		public static interface FilesUploadArea {
-			String FILE_UPLOAD_ID = IndexPage.MAIN_FORM_ID + ":fileUpload";
-		}
-		
-		public static interface TreeArea {
-			
-		}
-	}
-
-	
-	public static void login(Selenium selenium) {
-		selenium.click(HtmlConstants.LogInOutArea.LOGIN_LINK_ID);
-		try {
-			Thread.sleep(5000);
-		}catch (Exception e) {
-			Assert.fail("Test failed caused by: " + e);
-		}
-		
-		Assert.assertTrue(selenium.isVisible(HtmlConstants.LoginPage.usernameId), "Input for username in not visible");
-		Assert.assertTrue(selenium.isVisible(HtmlConstants.LoginPage.passwordId), "Input for password in not visible");
-		
-		String type = selenium.getAttribute("//*[@id='"+HtmlConstants.LoginPage.passwordId+"']/@type");
-		if (!"password".equals(type)) {
-			Assert.fail("Password input should be of 'password' type");
-		}
-		
-		selenium.type(HtmlConstants.LoginPage.usernameId, UserInfoConstants.LOGIN_NAME);
-		selenium.type(HtmlConstants.LoginPage.passwordId, UserInfoConstants.LOGIN_PASSWORD);
-		
-		selenium.click(HtmlConstants.LoginPage.loginButtonPath);
-		selenium.waitForPageToLoad("10000");
-		
-		if (!isLogined(selenium, UserInfoConstants.LOGIN_NAME)) {
-			Assert.fail("Authentication was not succesfull. Logged user text should contain typed login name");
-		}
-
-	}
-	
-	public static void logout(Selenium selenium) {
-		selenium.click(HtmlConstants.LogInOutArea.LOGOUT_LINK_PATH);
-		selenium.waitForPageToLoad(String.valueOf(TIMEOUT));
-		Assert.assertFalse(isLogined(selenium), "Logout was not succesfull.");
-	}
-	
-	public static void testUserProfile(Selenium selenium) {
-		String name = selenium.getValue(HtmlConstants.UserProfileArea.NAME_INPUT_ID);
-		Assert.assertEquals(name, UserInfoConstants.LOGIN_NAME);
-	}
-	
-	public static void testFilesUpload(Selenium selenium) {
-		Assert.assertTrue(selenium.isVisible(HtmlConstants.FilesUploadArea.FILE_UPLOAD_ID));
-	}
-	
-	public static void testShelfArea(Selenium selenium) {
-		testShelfArea(selenium, null);
-	}
-
-	public static void testShelfArea(Selenium selenium, String shelfName) {
-		Assert.assertTrue(selenium.isVisible(HtmlConstants.ShelfArea.HEADER_PATH));
-		if (shelfName != null) {
-			String text = selenium.getText(RealWorldHelper.HtmlConstants.ShelfArea.SHELF_NAME_PATH);
-			Assert.assertTrue(text.contains(shelfName), "Incorrect data was opened after click by album");
-		}
-	}
-	
-	public static void openAlbumFromShelfArea(Selenium selenium) {		
-		String albumName = selenium.getText(RealWorldHelper.HtmlConstants.ShelfArea.ALBUM_NAME_PATH);
-		
-		selenium.click(RealWorldHelper.HtmlConstants.ShelfArea.ALBUM_LINK_PATH);
-		waitForAjaxCompletion(selenium);
-		
-		testAlbumArea(selenium, albumName);
-	}
-	
-	public static void testAlbumArea(Selenium selenium) {
-		testAlbumArea(selenium, null);
-	}
-
-	public static void testAlbumArea(Selenium selenium, String albumName) {
-		Assert.assertTrue(selenium.isVisible(HtmlConstants.AlbumArea.HEADER_PATH));
-		if (albumName != null) {
-			String text = selenium.getText(RealWorldHelper.HtmlConstants.AlbumArea.ALBUM_NAME_PATH);
-			Assert.assertTrue(text.contains(albumName), "Incorrect data was opened after click by album");
-		}
-	}
-	
-	public static void openImageFromAlbumArea(Selenium selenium) {		
-		String imageName = selenium.getText(RealWorldHelper.HtmlConstants.AlbumArea.IMAGE_NAME_PATH);
-		
-		selenium.click(RealWorldHelper.HtmlConstants.AlbumArea.IMAGE_LINK_PATH);
-		waitForAjaxCompletion(selenium);
-		
-		testImageArea(selenium, imageName);
-	}
-		
-	public static void testImageArea(Selenium selenium) {
-		testImageArea(selenium, null);
-	}
-	
-	public static void testImageArea(Selenium selenium, String imageName) {
-		Assert.assertTrue(selenium.isVisible(HtmlConstants.ImageArea.HEADER_PATH));
-		if (imageName != null) {
-			String text = selenium.getText(RealWorldHelper.HtmlConstants.ImageArea.IMAGE_NAME_PATH);
-			Assert.assertTrue(text.contains(imageName), "Incorrect data was opened after click by image");
-		}
-	}
-
-	public static void waitForAjaxCompletion(Selenium selenium) {
-		waitForAjaxCompletion(selenium, TIMEOUT);
-    }
-    public static void waitForAjaxCompletion(Selenium selenium, int miliseconds) {
-        selenium.waitForCondition(WINDOW_JS_RESOLVER + "document.getElementById('" + STATUS_START_ID + "').style.display == 'none'", String.valueOf(miliseconds));
-    }
-    
-    public static boolean isLogined(Selenium selenium) {
-    	return isLogined(selenium, null);
-    }
-
-    public static boolean isLogined(Selenium selenium, String name) {
-    	boolean logined = !selenium.getXpathCount(HtmlConstants.LogInOutArea.USER_INFO_LINK_PATH).equals(0);
-    	if (logined && name != null) {
-    		logined = selenium.getText(HtmlConstants.LogInOutArea.USER_INFO_LINK_PATH).contains(name);
-    	}
-    	return logined;    	
-    }
-}

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/photoalbum/testng/LoginTest.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/testng/LoginTest.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -3,7 +3,7 @@
  */
 package org.richfaces.photoalbum.testng;
 
-import org.richfaces.photoalbum.RealWorldHelper;
+import org.richfaces.photoalbum.PhotoAlbumHelper;
 import org.richfaces.photoalbum.SeleniumTestBase;
 import org.testng.annotations.Test;
 
@@ -18,7 +18,7 @@
 	public void testAuthentication() {
 		renderPage();
 		
-		RealWorldHelper.login(selenium);
-		RealWorldHelper.logout(selenium);
+		PhotoAlbumHelper.login(selenium);
+		PhotoAlbumHelper.logout(selenium);
 	}
 }

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/photoalbum/testng/OpenAreasUseCasesTest.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/tests/src/test/java/org/richfaces/photoalbum/testng/OpenAreasUseCasesTest.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -3,9 +3,9 @@
  */
 package org.richfaces.photoalbum.testng;
 
-import org.richfaces.photoalbum.RealWorldHelper;
+import org.richfaces.photoalbum.PhotoAlbumHelper;
 import org.richfaces.photoalbum.SeleniumTestBase;
-import org.richfaces.photoalbum.RealWorldHelper.HtmlConstants;
+import org.richfaces.photoalbum.PhotoAlbumHelper.HtmlConstants;
 import org.testng.annotations.Test;
 
 /**
@@ -17,52 +17,52 @@
 	@Test
 	public void testOpenAlbumAndImageWithoutAuthentication() {
 		renderPage();
-		RealWorldHelper.openAlbumFromShelfArea(selenium);
-		RealWorldHelper.openImageFromAlbumArea(selenium);
+		PhotoAlbumHelper.openAlbumFromShelfArea(selenium);
+		PhotoAlbumHelper.openImageFromAlbumArea(selenium);
 	}
 	
 	@Test
 	public void testOpenAlbumAndImageWithAuthentication() {
 		renderPage();
-		RealWorldHelper.login(selenium);
-		RealWorldHelper.openAlbumFromShelfArea(selenium);
-		RealWorldHelper.openImageFromAlbumArea(selenium);
+		PhotoAlbumHelper.login(selenium);
+		PhotoAlbumHelper.openAlbumFromShelfArea(selenium);
+		PhotoAlbumHelper.openImageFromAlbumArea(selenium);
 	}
 
 	@Test
 	public void testOpenUserProfile() {
 		renderPage();
-		RealWorldHelper.login(selenium);
+		PhotoAlbumHelper.login(selenium);
 		selenium.click(HtmlConstants.LogInOutArea.USER_INFO_LINK_PATH);
 		waitForAjaxCompletion();
-		RealWorldHelper.testUserProfile(selenium);
+		PhotoAlbumHelper.testUserProfile(selenium);
 	}
 	
 	@Test
 	public void testOpenFilesUpload() {
 		renderPage();
-		RealWorldHelper.login(selenium);
+		PhotoAlbumHelper.login(selenium);
 		selenium.click(HtmlConstants.ToolBarArea.ADD_IMAGE_LINK_PATH);
 		waitForAjaxCompletion();
-		RealWorldHelper.testFilesUpload(selenium);
+		PhotoAlbumHelper.testFilesUpload(selenium);
 	}
 	
 	
 	@Test
 	public void testToolbarViewButtons() {
 		renderPage();
-		RealWorldHelper.login(selenium);
+		PhotoAlbumHelper.login(selenium);
 		
 		selenium.click(HtmlConstants.ToolBarArea.VIEW_SHELFS_PATH);
 		waitForAjaxCompletion();
-		RealWorldHelper.testShelfArea(selenium);
+		PhotoAlbumHelper.testShelfArea(selenium);
 
 		selenium.click(HtmlConstants.ToolBarArea.VIEW_ALBUMS_PATH);
 		waitForAjaxCompletion();
-		RealWorldHelper.testAlbumArea(selenium);
+		PhotoAlbumHelper.testAlbumArea(selenium);
 		
 		selenium.click(HtmlConstants.ToolBarArea.VIEW_IMAGES_PATH);
 		waitForAjaxCompletion();
-		RealWorldHelper.testImageArea(selenium);
+		PhotoAlbumHelper.testImageArea(selenium);
 	}
 }

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/photoalbum/util/CopyImageStuff.java	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/photoalbum/util/CopyImageStuff.java	2009-04-20 17:20:11 UTC (rev 13707)
@@ -12,7 +12,6 @@
 import org.jboss.seam.annotations.Startup;
 import org.jboss.seam.contexts.ServletLifecycle;
 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;
@@ -69,7 +68,7 @@
 	
 	private void resolveUploadRoot() throws IOException {
 		uploadRoot = new File(joinFiles(
-				System.getProperty(TEMP_DIR), REALWORLD_FOLDER));
+				System.getProperty(TEMP_DIR), "richfaces_photoalbum"));
 
 		if (uploadRoot.exists()) {
 			deleteDirectory(uploadRoot, true);

Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties	2009-04-20 17:20:11 UTC (rev 13707)
@@ -167,7 +167,7 @@
 user.confirm.error=Confirm Password not equals password
 user.sex=Sex
 user.dontshowmail=Do not show to others
-user.informaboutnews=Inform me about news in RealWorld Demo
+user.informaboutnews=Inform me about news in Photo Album Demo
 user.changeavatar=Change avatar 
 
 menu.welcome=Welcome, 

Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/components.xml	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/components.xml	2009-04-20 17:20:11 UTC (rev 13707)
@@ -27,7 +27,7 @@
                   default-flush-mode="MANUAL"/>
     <persistence:managed-persistence-context name="entityManager"
                                              auto-create="true"
-                                             persistence-unit-jndi-name="java:/realWorldEntityManager"/>
+                                             persistence-unit-jndi-name="java:/photoalbumEntityManager"/>
     <transaction:ejb-transaction/>
     <security:identity authenticate-method="#{authenticator.authenticate}"/>
     <component name="authenticator" digestAlgorithm="SHA-1" charset="UTF-8"/>

Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/photoalbum-taglib.xml (from rev 13672, 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/photoalbum-taglib.xml	                        (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/photoalbum-taglib.xml	2009-04-20 17:20:11 UTC (rev 13707)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+  "facelet-taglib_1_0.dtd">
+<facelet-taglib>
+   <namespace>http://richfaces.org/richx</namespace>
+	<tag>
+	   <tag-name>commandButton</tag-name>
+	   <source>templates/button.xhtml</source>
+	</tag>
+	<tag>
+		<tag-name>actionMapper</tag-name>
+		<handler-class>org.richfaces.photoalbum.util.ActionMapperTagHandler</handler-class>
+	</tag>
+</facelet-taglib>
\ No newline at end of file


Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/photoalbum-taglib.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: 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 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml	2009-04-20 17:20:11 UTC (rev 13707)
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "facelet-taglib_1_0.dtd">
-<facelet-taglib>
-   <namespace>http://richfaces.org/richx</namespace>
-	<tag>
-	   <tag-name>commandButton</tag-name>
-	   <source>templates/button.xhtml</source>
-	</tag>
-	<tag>
-		<tag-name>actionMapper</tag-name>
-		<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/tags/templates/button.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml	2009-04-20 17:20:11 UTC (rev 13707)
@@ -11,7 +11,7 @@
 	<a4j:loadScript src="/scripts/buttons.js" />
 
 	<richx:actionMapper>
-		<a4j:outputPanel layout="block" style="#{style}" styleClass="realworldButton #{styleClass}" lang="#{lang}" dir="#{dir}" title="#{title}" 
+		<a4j:outputPanel layout="block" style="#{style}" styleClass="photoalbumButton #{styleClass}" lang="#{lang}" dir="#{dir}" title="#{title}" 
 			rendered="#{empty rendered or rendered}"
 			onmousedown="RF_RW_DEMO.toPressed(this)" onmouseup="RF_RW_DEMO.toReleased(this)" onmouseout="RF_RW_DEMO.toReleased(this)">
 		

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 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml	2009-04-20 17:20:11 UTC (rev 13707)
@@ -86,7 +86,7 @@
 	
 	<context-param>
 		<param-name>facelets.LIBRARIES</param-name>
-		<param-value>/WEB-INF/tags/realWorld-taglib.xml</param-value>
+		<param-value>/WEB-INF/tags/photoalbum-taglib.xml</param-value>
 	</context-param>
 	
 	<!--  <context-param>

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

Copied: trunk/test-applications/realworld2/web/src/main/webapp/scripts/photoalbum.js (from rev 13670, trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js)
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/scripts/photoalbum.js	                        (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/scripts/photoalbum.js	2009-04-20 17:20:11 UTC (rev 13707)
@@ -0,0 +1,25 @@
+function selectPopularTag(tag, target) {
+	if(target) {
+		var value = target.value.strip();
+		if(value.indexOf(tag) == -1) {
+			target.value = value.length != 0 ? value + ", " + tag : tag; 
+		}
+	}
+}
+
+function applyModalPanelEffect(panelId, effectFunc, params) {
+	if (panelId && effectFunc) {
+		
+		var modalPanel = $(panelId);
+		
+		if (modalPanel && modalPanel.component) {
+			var component = modalPanel.component;
+			var div = component.getSizedElement(); 
+			
+			Element.hide(div);
+						
+			effectFunc.call(this, Object.extend({targetId: div.id}, params || {}));
+		}
+				
+	}
+}
\ No newline at end of file


Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/scripts/photoalbum.js
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js	2009-04-20 17:20:11 UTC (rev 13707)
@@ -1,25 +0,0 @@
-function selectPopularTag(tag, target) {
-	if(target) {
-		var value = target.value.strip();
-		if(value.indexOf(tag) == -1) {
-			target.value = value.length != 0 ? value + ", " + tag : tag; 
-		}
-	}
-}
-
-function applyModalPanelEffect(panelId, effectFunc, params) {
-	if (panelId && effectFunc) {
-		
-		var modalPanel = $(panelId);
-		
-		if (modalPanel && modalPanel.component) {
-			var component = modalPanel.component;
-			var div = component.getSizedElement(); 
-			
-			Element.hide(div);
-						
-			effectFunc.call(this, Object.extend({targetId: div.id}, params || {}));
-		}
-				
-	}
-}
\ No newline at end of file

Copied: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/photoalbum.css (from rev 13670, trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css)
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/photoalbum.css	                        (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/photoalbum.css	2009-04-20 17:20:11 UTC (rev 13707)
@@ -0,0 +1,972 @@
+.main-body {
+	margin: 0px;
+	background: url(../img/shell/page_bg.gif) repeat-x #D7D7D7;
+	height: 100%;
+}
+
+.header-panel {
+	height: 116px;
+	border: none;
+	padding: 0px;
+	background: none;
+}
+
+.header-panel-body {
+	padding: 0px;
+}
+
+.header-content-div {
+	height: 79px;
+	position: relative;
+}
+
+.user-info-div {
+	position: absolute;
+	font-weight: bold;
+	color: #ffffff;
+	right: 20px;
+	top: 45px;
+}
+
+.top-right-menu {
+	position: absolute;
+	right: 8px;
+	top: 14px;
+}
+
+.top-right-menu-toolbar {
+	background: none;
+	border: none;
+}
+
+.top-right-menu-item {
+	vertical-align: top;
+	padding: 0px;
+}
+
+
+
+.top-right-menu-item a{
+	font-size: 11px;
+	color: #ffffff;
+	text-decoration: none;
+	font-weight: normal;
+
+}
+
+.top-right-menu-item-padding {
+	padding: 0px 8px 0px 15px;	
+}	
+.main-menu-panel {
+	height: 37px;
+	position: relative;
+	border: none;
+	padding: 0px;
+	background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807;
+}
+
+.main-menu-panel-body {
+	border: none;
+	padding: 0px;
+}
+
+.body-main-bg {
+	background: url(../img/shell/general_panel_bg.gif) right top repeat-y;	
+}
+
+.body-main-panel {
+
+	height: 100%;
+	padding: 0px;
+	border: none;
+	background-color: transparent;
+}
+
+.body-main-panel-header {
+	height: 15px;
+	background: url(../img/shell/general_panel_header_bg.gif) right top;
+	font-size: 1px;
+	padding: 0px;
+	border: none;
+}
+
+.avatarUpload .file-upload-stop-button{
+	display:none;
+}
+
+.file-upload-button{
+	background:#B34801;
+	color: #FFFFFF;
+	border:1px solid #888888;
+}
+
+
+.avatarUpload .rich-fileupload-ico {
+padding-left:7px;
+}
+.avatarUpload .rich-fileupload-toolbar-decor {
+width:100%;
+background-color:#D7D7D7;
+border-bottom:0px;
+border-left:0px;
+border-top:0px;
+padding:0px;
+}
+
+.avatarUpload .rich-fileupload-ico-add {
+background-image:none;
+}
+
+.avatarUpload .rich-fileupload-button-border{
+border:0px ;
+margin:0px;
+}
+
+.avatarUpload .rich-fileupload-list-decor {
+width:100%;
+background-color:D7D7D7;
+border-bottom:0px;
+border-left:0px;
+border-top:0px;
+padding:0px;
+}
+.avatarUpload .rich-fileupload-button-light{
+	padding:0px;
+	background:#B34801;
+	cursor:pointer;
+	 border:1px solid #B34801;
+	}
+	
+	.avatarUpload .rich-fileupload-button{
+	padding:0px;
+	background:#B34801;
+	 border:1px solid #888888;
+	}
+	
+.footer-panel {
+	height: 82px;
+	position: relative;
+	background: url(../img/shell/footer_bg.gif) repeat-x #000000;
+	border: none;
+	padding: 0px;	
+}
+
+.footer-panel-content {
+	position: absolute;
+	left: 8px;
+	top: 51px;
+}
+
+.body-main-panel-body{
+	padding: 15px 35px 15px 15px;
+}
+
+.bottom-right-menu-item {
+	vertical-align: top;
+	padding: 0px 15px 0px 8px;
+}
+
+.bottom-right-menu-item-content {
+	font-size: 11px;
+	color: #ffffff;
+	text-decoration: none;
+}
+
+.logged-user {
+	color: #FF7D2A;
+	padding:0 8px 0 0;
+}
+
+.main-menu-toolbar {
+	background: none;
+	border: none;
+}
+
+.main-menu-toolbar-content a {
+	color: #FFFFFF;
+	font-size: 11px;
+	font-weight: bold;
+	text-decoration: none;	
+}
+
+.main-menu-toolbar-content{
+	width: 100%;
+}
+
+.table-boby-column1{
+	vertical-align: top;
+}
+
+.table-boby-column2{
+	vertical-align: top;
+}
+
+.main-menu-table{
+	width: 100%;
+}
+	
+.menu-cloumn1{
+	width: 90%
+}
+.menu-cloumn2{
+	width: 10%
+}
+
+.login-panel{
+	width: 400px;
+}
+
+input[type='submit'], input[type='button'], button {
+	background: #414141;
+	color: white;
+	margin: 5px;
+	border-color: black;
+}
+
+.login-table-col{
+	text-align: center;
+}
+
+.login-table-col2{
+	text-align: left;
+}
+
+.login-body-table-col{
+	align: middle;
+	vertical-align: middle;
+	height: 100%;
+}
+
+.main-image{
+	border: none;
+}
+
+.slider-image {
+	opacity: 0.1;
+	filter: opacity=10;
+}
+
+.all-images{
+	border: none;
+}
+
+.message {
+	border: 1px solid #FFCC00;
+	padding: 5px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	background-color: #F0F8FF;
+	font-size: 12px;
+	color: red;
+}
+
+.name {
+	font-weight: bold;
+	width: 115px;
+	padding: 5px;
+	margin-top: 3px;
+}
+.value {
+	padding: 5px;
+}
+
+.error {
+	padding: 5px;
+	color: red;
+}
+.errors {
+	color: red;
+	vertical-align: middle;
+}
+img.errors {
+	padding-right: 5px;
+}
+.errors input {
+	border: 1px solid red;
+}
+.errors textarea {
+	border: 1px solid red;
+}
+
+.required {
+	color: red;
+	padding-left: 2px;
+}
+
+.rich-stglpanel-body {
+   overflow: auto;
+}
+.top {
+    vertical-align: top;
+}
+.info {
+    height: 202px;
+    overflow: auto;
+}
+
+.a4j-status {
+	border: 1px solid white; 
+	padding: 5px; 
+	position: absolute; 
+	z-index: 3; 
+	left: 50%; 
+	top: 40px; 
+}
+
+a{color : #DF6400;}
+h1{font-size : 175%; font-weight : normal; margin : 0px;}
+.h1-style{
+	font-size : 175%; font-weight : normal; margin : 0px;
+}
+
+.content_box {padding : 15px 35px 15px 35px;}
+.content_box p {margin : 0px 0px 5px 0px; FONT-SIZE : 12PX}
+
+.preview_box_album_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
+.preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_80 table img{margin: 0px 0px 2px 0px;}
+.preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
+
+.preview_box_album_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute; border: 0px;}
+.preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_120 table img{margin: 0px 0px 2px 0px;}
+.preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
+
+.preview_box_album_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute; border: 0px;}
+.preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_album_160 table img{margin: 0px 0px 1px 1px;}
+.preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
+
+
+
+.preview_box_photo_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
+.preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_80 table img{margin: 0px 0px 0px 0px;}
+.preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
+
+.preview_box_photo_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute; border: 0px;}
+.preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_120 table img{margin: 0px 0px 0px 0px;}
+.preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
+
+.preview_box_photo_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute; border: 0px;}
+.preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_160 table img{margin: 0px 0px 0px 0px;}
+.preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
+
+.preview_box_photo_200 {width : 220px; position : relative; float : left; margin : 0px 10px 10px 0px;}
+.preview_box_photo_200 img.pr_photo_bg {width : 220px; height : 220px; position : absolute; border: 0px;}
+.preview_box_photo_200 table{position : relative; width : 220px; height : 220px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_200 table img{margin: 0px 0px 0px 0px;}
+.preview_box_photo_200 div.photo_name {text-align : center; overflow : hidden; width : 220px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
+.preview_box_photo_200 div.photo_data {text-align : center; overflow : hidden; width : 220px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
+
+
+.preview_box_photo_nav {width : 100px; height : 100px; position : relative; float : left; margin : 0px 2px 0px 0px;}
+.preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
+.preview_box_photo_nav table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
+.preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
+.preview_box_photo_current table img{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;}
+
+.preview_box_photo_default table {
+	cursor: pointer;
+}
+
+.image-scroller {
+	position: relative;
+	left: 0px;
+	top: 0px;
+}
+
+.image-scroller table {
+	position: absolute;
+	left: 0px;
+	top: 0px;
+	width: 100%;
+}
+
+.image-scroller, .image-scroller * {
+	border-style: none;
+	background-color: transparent;
+}
+		
+.image-scroller-left-arrow {
+	position: absolute; 
+	top: 80px; 
+	left: -35px;
+	z-index: 2;
+}
+		
+.image-scroller-right-arrow {
+	position: absolute; 
+	top: 80px; 
+	right: -33px;
+	z-index: 2;
+}
+
+.search-div {
+	height: 65px; 
+	width: 339px; 
+	position: absolute; 
+	top: 64px; 
+	right: 0px; 
+	margin-right: 0px;
+}
+
+.search-img-bg {
+	position: absolute; 
+	top: 0px; 
+	left: 0px;
+}
+
+.search-label {
+	position: absolute; 
+	color: rgb(255, 255, 255); 
+	font-weight: bold; 
+	top: 22px; 
+	left: 20px;
+}
+
+.search-find-button {
+	position: absolute; 
+	color: rgb(255, 255, 255); 
+	font-weight: bold; 
+	top: 21px; 
+	left: 277px; 
+	text-decoration: none;
+}
+
+.search-input {
+	border: 0px none ; 
+	background: transparent none repeat scroll 0% 0%; 
+	width: 176px; 
+	height: 17px; 
+	position: absolute; 
+	top: 20px; 
+	left: 73px; 
+	-moz-background-clip: -moz-initial; 
+	-moz-background-origin: -moz-initial; 
+	-moz-background-inline-policy: -moz-initial; 
+	font-weight: bold;
+}
+
+.search-img {
+	width: 61px; 
+	height: 18px; 
+	position: absolute; 
+	top: 20px; 
+	left: 261px;
+}
+
+.search-option-div {
+	position: absolute; 
+	top: 41px; 
+	left: 197px;
+}
+
+.search-option-link {
+	color: rgb(255, 255, 255); 
+	text-decoration: none;
+}
+
+.search-options {
+	background: transparent none repeat scroll 0% 0%; 
+	overflow: hidden; 
+	height: 110px; 
+	width: 327px; 
+	position: absolute; 
+	top: 107px; 
+	right: 5px; 
+	-moz-background-clip: -moz-initial; 
+	-moz-background-origin: -moz-initial; 
+	-moz-background-inline-policy: -moz-initial; 
+}
+
+.search-option-img {
+	position: absolute; 
+	bottom: 0px; 
+	left: 0px;
+}
+
+.search-options-div1 {
+	position: absolute; 
+	color: white; 
+	top: 7px; 
+	left: 45px;
+}
+
+.search-options-div2 {
+	border-top: 1px solid rgb(56, 56, 56); 
+	position: absolute; 
+	color: white; 
+	top: 32px; 
+	padding-top: 3px; 
+	left: 38px;
+}
+
+.search-hide-options-div {
+	position: absolute; 
+	bottom: 5px; 
+	left: 163px;
+}
+
+.search-hide-options-link {
+	color: rgb(255, 255, 255); 
+	text-decoration: none;
+}
+
+.dr-tree-h-text {
+	white-space: normal;
+}
+
+.tree-selected-node{
+	font-weight: bold;
+	background: #F1F1F1;
+	border: #FFFFFF 1px solid;
+}
+
+.dr-tree-h-ic-div {
+	margin: 0px;
+	padding-left: 0px;
+	padding-bottom: 5px;
+}
+
+.avatar {
+	width: 100px;
+}
+
+.rich-tree-node rich-cm-attached {
+	padding-top: 3px;
+}
+
+.dr-tree-h-ic-img{
+	width: 25px; 
+}
+
+.dr-insldr-vert-spacer {
+	padding: 0px;
+}
+
+.shelf-header-table{
+	border-collapse : collapse; 
+	margin-bottom : 15px;
+}
+
+.shelf-header-table h1{
+	margin-bottom : 4px;
+}
+
+.shelf-header-table-col2{
+	padding : 8px 0px 0px 20px; 
+	vertical-align : top; 
+	white-space : nowrap;
+}
+
+.additional-info-text{
+	color : #666666;
+}
+
+.additional-info-avatar {
+	width: 80px; 
+	height: 80px;
+	border:0px;
+}
+
+.additional-info-comment-del {
+	float : right; 
+	cursor : pointer
+}
+
+.album-header-table{
+	border-collapse : collapse; 
+	margin-bottom : 15px;
+}
+
+.album-header-table h1{
+	margin-bottom : 4px;
+}
+
+.album-header-table-col2{
+	padding : 8px 0px 0px 20px; 
+	vertical-align : top; 
+	white-space : nowrap;
+}
+
+.album-cover-image{
+	border : 1px solid #FFFFFF;
+}
+
+.image-header-table{
+	border-collapse : collapse; 
+	margin-bottom : 15px;
+}
+
+.image-header-table h1{
+	margin-bottom : 4px;
+}
+
+.image-header-table-col2{
+	padding : 8px 0px 0px 20px; 
+	vertical-align : top; 
+	white-space : nowrap;
+}
+
+.image-cover-image{
+	border : 2px solid #FFFFFF;
+}
+
+.mainImage-div{
+	padding-top : 10px;
+}
+
+.mainImage-table{
+	border-collapse : collapse; 
+	margin-bottom : 5px;
+}
+
+.mainImage-table-col1{
+	padding-right : 10px; 
+	padding-left : 30px; 
+	text-align : right;
+}
+
+.mainImage-table-col3{
+	padding-bottom : 5px
+}
+
+.buttons-body{
+	cursor : pointer; 
+	margin : 0px 0px 0px 0px; 
+	position : relative; 
+	width : 103px; 
+	height : 28px;
+}
+
+.buttons-body-image{
+	position : absolute; 
+	top : 0px; 
+	left : 0px; 
+	border: 0px;
+}
+.buttons-body-text-div{
+	position : absolute; 
+	color : #ffffff; 
+	top : 7px; 
+	left : 8px;
+}
+.buttons-body-spacer-image{
+	position : absolute; 
+	top : 0px; 
+	left : 0px;
+	border: 0px;
+}
+
+.slideshow-outerdiv{
+	cursor : pointer; 
+	margin-bottom : 7px
+}
+
+.comment-table{
+	border-collapse : collapse; 
+	margin-bottom : 20px;
+}
+.comment-deleteLink{
+	margin : 1px 0px 7px 0px; 
+	background : #f1f1f1; 
+	padding : 3px 4px 4px 4px;
+}
+.comment-text{
+	margin : 0px 0px 10px 0px; 
+	padding : 0px 4px 0px 4px;
+}
+
+.image-edit-div{
+	margin : 10px 0px 30px 30px; 
+	width : 504px; 
+	background : #f1f1f1;
+}
+.image-edit-div-table{
+	border-collapse : collapse;
+}
+
+.image-edit-label {
+	padding-top : 8px;
+}
+
+.image-edit-photo-input {
+	border : 1px solid #999999; 
+	width : 350px;
+}
+
+.image-edit-calendar {
+	border : 1px solid #999999; 
+	width : 80px;
+}
+
+.image-edit-description-input {
+	border : 1px solid #999999; 
+	width : 350px; 
+	height : 150px;
+}
+
+.image-edit-tags-input {
+	border : 1px solid #999999; 
+	width : 150px; 
+	margin-bottom : 4px;
+}
+
+.image-edit-direct-link {
+	border : 0px; 
+	background : none; 
+	width : 350px
+}
+
+.main-menu-icons-outer-div {
+	cursor: pointer;
+	float: left;
+	padding: 4px 2px 0px 2px;
+}
+
+.main-menu-icons-left-div {
+	height: 23px;
+	float: left;
+}
+
+.main-menu-icons-middle-div {
+	height: 23px;
+	float: left;
+	background: url(../img/shell/informer_bg.png) top left no-repeat;
+	color: #FFFFFF;
+	padding: 4px 0px 0px 0px;
+}
+
+.main-menu-icons-right-div {
+	height : 23px; 
+	float : left; 
+	width : 10px; 
+	overflow : hidden; 
+	position : relative;
+}
+.main-menu-icons-backgroung-img {
+	position : absolute; 
+	top : 0px; 
+	right : 0px; 
+	border: 0px;
+}
+.main-menu-separator-img{
+	float:left; 
+	margin : 8px 15px 0px 15px;
+	border : 0px;
+}
+.main-menu-add-icons-img{
+	padding : 4px 0px 0px 5px;
+	border : 0px;
+}
+
+.rich-tabpanel-content{
+	border: none;
+	background: none;
+}
+.rich-tabhdr-side-cell{
+	border: none;	
+}
+.rich-tabhdr-side-border{
+	border: none;
+	background: none;
+}
+.rich-tab-bottom-line{
+	border: none;
+	background: none;
+}
+
+.rich-tab-active{
+	border-right: 1px solid;
+	border-right-color: black;
+	border-left: 0px;
+	border-top: 0px;
+	font-size : 175%; 
+	background: none;
+	font-weight : normal; 
+	margin : 4px;
+}
+
+.rich-tab-inactive{
+	border-right: 1px solid;
+	border-right-color: black;
+	border-left: 0px;
+	border-top: 0px;
+	background: none;
+	color : #DF6400;
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+.top-right-bottom-menu-item {
+	vertical-align: top;
+	padding: 0px;
+}
+
+.top-right-bottom-menu-item-link a{
+	font-size: 11px;
+	color: #ffffff;
+	text-decoration: none;
+	font-weight: normal;
+	padding: 0px 0px 0px 15px;
+}
+.slideshow-link{
+	color:black;
+	text-decoration:none;
+}
+
+
+.photoalbumButton {
+	margin: 0px 0px 0px 0px; 
+	position: relative; 
+	width: 103px; 
+	height: 28px;
+	cursor: pointer;
+}
+
+.photoalbumButton input, .photoalbumButton img {
+	position: absolute; 
+	top: 0px; 
+	left: 0px;
+	width: 103px;
+	height: 28px;
+}
+
+.photoalbumButton img {
+	border-width: 0px;
+}
+
+.photoalbumButton input {
+	outline-style: none;
+}
+
+.photoalbumButton div {
+	position: absolute; 
+	color: #ffffff; 
+	top: 7px; 
+	left: 0px; 
+	width: 103px; 
+	text-align: center; 
+}
+
+.album-edit-field {
+	padding-top : 8px
+}
+
+.album-edit-calendar {
+	border : 1px solid #999999; 
+	width : 80px
+}
+
+.album-edit-input {
+	border : 1px solid #999999; 
+	width : 350px
+}
+	
+.album-edit-area {
+	border : 1px solid #999999; 
+	width : 350px; 
+	height : 150px;
+}
+
+.search-criteria {
+	color: #666666;
+}
+
+.shelf-edit {
+	margin : 10px 0px 30px 30px; 
+	width : 504px; 
+	background : #f1f1f1;
+}
+
+.shelf-edit-calendar {
+	border : 1px solid #999999; 
+	width : 80px;
+}
+
+.shelf-edit-input {
+	border : 1px solid #999999; 
+	width : 350px;
+}
+
+.shelf-edit-area {
+	border : 1px solid #999999; 
+	width : 350px; 
+	height : 150px
+}
+
+.tag-panel {
+	border: 0px; 
+	background: none; 
+	overflow: auto;
+}
+
+.tag-table {
+	float: left; 
+	margin: 0px 10px 10px 0px;
+}
+
+.tag-table-td {
+	text-align: center; 
+	vertical-align: middle; 
+	background: white; 
+	border: 1px solid #909090;
+}
+
+.reg-table{
+	padding : 0px 10px 10px 0px;
+}
+
+.reg-table-col1{
+	vertical-align : top;
+}
+.reg-table-col3{
+	vertical-align : top;
+}
+.reg-table-input{
+	border : 1px solid #909090; 
+	height : 19px; 
+	width : 155px
+}
+.reg-table-output{
+	height : 19px; 
+	width : 155px;
+	padding: 5px;
+	font-weight: bold;
+}
+
+.slideshow-table{
+	width: 100%;
+	height: 100%;
+}
+
+.slideshow-table-col{
+	text-align: center;
+}
+
+.slideshow-table-row{
+	vertical-align: middle;
+}
+
+.rich-menu-item-icon img{
+	border:0px;
+}
+
+.rich-inplace {
+	font-size: inherit;
+}
\ No newline at end of file


Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/photoalbum.css
___________________________________________________________________
Name: svn:mime-type
   + text/css
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css	2009-04-20 16:17:23 UTC (rev 13706)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css	2009-04-20 17:20:11 UTC (rev 13707)
@@ -1,979 +0,0 @@
-.main-body {
-	margin: 0px;
-	background: url(../img/shell/panel_bg.gif) repeat-y #D7D7D7;
-	height: 100%;
-}
-
-.header-panel {
-	height: 116px;
-	border: none;
-	padding: 0px;
-	background: none;
-}
-
-.header-panel-body {
-	padding: 0px;
-}
-
-.panel-header-bg {
-	background: url(../img/shell/general_panel_header_bg.gif) right top repeat-x;	
-}
-
-.header-content-div {
-	height: 79px;
-	position: relative;
-	background: url(../img/shell/page_bg.gif) repeat-x scroll 0 0;
-}
-
-.user-info-div {
-	position: absolute;
-	font-weight: bold;
-	color: #ffffff;
-	right: 20px;
-	top: 45px;
-}
-
-.top-right-menu {
-	position: absolute;
-	right: 8px;
-	top: 14px;
-}
-
-.top-right-menu-toolbar {
-	background: none;
-	border: none;
-}
-
-.top-right-menu-item {
-	vertical-align: top;
-	padding: 0px;
-}
-
-
-
-.top-right-menu-item a{
-	font-size: 11px;
-	color: #ffffff;
-	text-decoration: none;
-	font-weight: normal;
-
-}
-
-.top-right-menu-item-padding {
-	padding: 0px 8px 0px 15px;	
-}	
-.main-menu-panel {
-	height: 37px;
-	position: relative;
-	border: none;
-	padding: 0px;
-	background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807;
-}
-
-.main-menu-panel-body {
-	border: none;
-	padding: 0px;
-}
-
-.body-main-bg {
-	background: url(../img/shell/general_panel_bg.gif) right top repeat-y;	
-}
-
-.body-main-panel {
-
-	height: 100%;
-	padding: 0px;
-	border: none;
-	background-color: transparent;
-	
-	
-}
-
-.body-main-panel-header {
-	height: 15px;
-	background: url(../img/shell/general_panel_header_bg.gif) right top;
-	font-size: 1px;
-	padding: 0px;
-	border: none;
-}
-
-.avatarUpload .file-upload-stop-button{
-	display:none;
-}
-
-.file-upload-button{
-	background:#B34801;
-	color: #FFFFFF;
-	border:1px solid #888888;
-}
-
-
-.avatarUpload .rich-fileupload-ico {
-padding-left:7px;
-}
-.avatarUpload .rich-fileupload-toolbar-decor {
-width:100%;
-background-color:#D7D7D7;
-border-bottom:0px;
-border-left:0px;
-border-top:0px;
-padding:0px;
-}
-
-.avatarUpload .rich-fileupload-ico-add {
-background-image:none;
-}
-
-.avatarUpload .rich-fileupload-button-border{
-border:0px ;
-margin:0px;
-}
-
-.avatarUpload .rich-fileupload-list-decor {
-width:100%;
-background-color:#D7D7D7;
-border-bottom:0px;
-border-left:0px;
-border-top:0px;
-padding:0px;
-}
-.avatarUpload .rich-fileupload-button-light{
-	padding:0px;
-	background:#B34801;
-	cursor:pointer;
-	 border:1px solid #B34801;
-	}
-	
-	.avatarUpload .rich-fileupload-button{
-	padding:0px;
-	background:#B34801;
-	 border:1px solid #888888;
-	}
-	
-.footer-panel {
-	height: 82px;
-	position: relative;
-	background: url(../img/shell/footer_bg.gif) repeat-x #000000;
-	border: none;
-	padding: 0px;	
-}
-
-.footer-panel-content {
-	position: absolute;
-	left: 8px;
-	top: 51px;
-}
-
-.body-main-panel-body{
-	padding: 15px 35px 15px 15px;
-}
-
-.bottom-right-menu-item {
-	vertical-align: top;
-	padding: 0px 15px 0px 8px;
-}
-
-.bottom-right-menu-item-content {
-	font-size: 11px;
-	color: #ffffff;
-	text-decoration: none;
-}
-
-.logged-user {
-	color: #FF7D2A;
-	padding:0 8px 0 0;
-}
-
-.main-menu-toolbar {
-	background: none;
-	border: none;
-}
-
-.main-menu-toolbar-content a {
-	color: #FFFFFF;
-	font-size: 11px;
-	font-weight: bold;
-	text-decoration: none;	
-}
-
-.main-menu-toolbar-content{
-	width: 100%;
-}
-
-.table-boby-column1{
-	vertical-align: top;
-}
-
-.table-boby-column2{
-	vertical-align: top;
-}
-
-.main-menu-table{
-	width: 100%;
-}
-	
-.menu-cloumn1{
-	width: 90%
-}
-.menu-cloumn2{
-	width: 10%
-}
-
-.login-panel{
-	width: 400px;
-}
-
-input[type='submit'], input[type='button'], button {
-	background: #414141;
-	color: white;
-	margin: 5px;
-	border-color: black;
-}
-
-.login-table-col{
-	text-align: center;
-}
-
-.login-table-col2{
-	text-align: left;
-}
-
-.login-body-table-col{
-	align: middle;
-	vertical-align: middle;
-	height: 100%;
-}
-
-.main-image{
-	border: none;
-}
-
-.slider-image {
-	opacity: 0.1;
-	filter: opacity=10;
-}
-
-.all-images{
-	border: none;
-}
-
-.message {
-	border: 1px solid #FFCC00;
-	padding: 5px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-	background-color: #F0F8FF;
-	font-size: 12px;
-	color: red;
-}
-
-.name {
-	font-weight: bold;
-	width: 115px;
-	padding: 5px;
-	margin-top: 3px;
-}
-.value {
-	padding: 5px;
-}
-
-.error {
-	padding: 5px;
-	color: red;
-}
-.errors {
-	color: red;
-	vertical-align: middle;
-}
-img.errors {
-	padding-right: 5px;
-}
-.errors input {
-	border: 1px solid red;
-}
-.errors textarea {
-	border: 1px solid red;
-}
-
-.required {
-	color: red;
-	padding-left: 2px;
-}
-
-.rich-stglpanel-body {
-   overflow: auto;
-}
-.top {
-    vertical-align: top;
-}
-.info {
-    height: 202px;
-    overflow: auto;
-}
-
-.a4j-status {
-	border: 1px solid white; 
-	padding: 5px; 
-	position: absolute; 
-	z-index: 3; 
-	left: 50%; 
-	top: 40px; 
-}
-
-a{color : #DF6400;}
-h1{font-size : 175%; font-weight : normal; margin : 0px;}
-.h1-style{
-	font-size : 175%; font-weight : normal; margin : 0px;
-}
-
-.content_box {padding : 15px 35px 15px 35px;}
-.content_box p {margin : 0px 0px 5px 0px; FONT-SIZE : 12PX}
-
-.preview_box_album_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
-.preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_album_80 table img{margin: 0px 0px 2px 0px;}
-.preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
-
-.preview_box_album_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute; border: 0px;}
-.preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_album_120 table img{margin: 0px 0px 2px 0px;}
-.preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
-
-.preview_box_album_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute; border: 0px;}
-.preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_album_160 table img{margin: 0px 0px 1px 1px;}
-.preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
-
-
-
-.preview_box_photo_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
-.preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_80 table img{margin: 0px 0px 0px 0px;}
-.preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
-
-.preview_box_photo_120 {width : 140px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute; border: 0px;}
-.preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_120 table img{margin: 0px 0px 0px 0px;}
-.preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
-
-.preview_box_photo_160 {width : 180px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute; border: 0px;}
-.preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_160 table img{margin: 0px 0px 0px 0px;}
-.preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
-
-.preview_box_photo_200 {width : 220px; position : relative; float : left; margin : 0px 10px 10px 0px;}
-.preview_box_photo_200 img.pr_photo_bg {width : 220px; height : 220px; position : absolute; border: 0px;}
-.preview_box_photo_200 table{position : relative; width : 220px; height : 220px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_200 table img{margin: 0px 0px 0px 0px;}
-.preview_box_photo_200 div.photo_name {text-align : center; overflow : hidden; width : 220px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;}
-.preview_box_photo_200 div.photo_data {text-align : center; overflow : hidden; width : 220px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px;  height : 14px}
-
-
-.preview_box_photo_nav {width : 100px; height : 100px; position : relative; float : left; margin : 0px 2px 0px 0px;}
-.preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;}
-.preview_box_photo_nav table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
-.preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;}
-.preview_box_photo_current table img{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;}
-
-.preview_box_photo_default table {
-	cursor: pointer;
-}
-
-.image-scroller {
-	position: relative;
-	left: 0px;
-	top: 0px;
-}
-
-.image-scroller table {
-	position: absolute;
-	left: 0px;
-	top: 0px;
-	width: 100%;
-}
-
-.image-scroller, .image-scroller * {
-	border-style: none;
-	background-color: transparent;
-}
-		
-.image-scroller-left-arrow {
-	position: absolute; 
-	top: 80px; 
-	left: -35px;
-	z-index: 2;
-}
-		
-.image-scroller-right-arrow {
-	position: absolute; 
-	top: 80px; 
-	right: -33px;
-	z-index: 2;
-}
-
-.search-div {
-	height: 65px; 
-	width: 339px; 
-	position: absolute; 
-	top: 64px; 
-	right: 0px; 
-	margin-right: 0px;
-}
-
-.search-img-bg {
-	position: absolute; 
-	top: 0px; 
-	left: 0px;
-}
-
-.search-label {
-	position: absolute; 
-	color: rgb(255, 255, 255); 
-	font-weight: bold; 
-	top: 22px; 
-	left: 20px;
-}
-
-.search-find-button {
-	position: absolute; 
-	color: rgb(255, 255, 255); 
-	font-weight: bold; 
-	top: 21px; 
-	left: 277px; 
-	text-decoration: none;
-}
-
-.search-input {
-	border: 0px none ; 
-	background: transparent none repeat scroll 0% 0%; 
-	width: 176px; 
-	height: 17px; 
-	position: absolute; 
-	top: 20px; 
-	left: 73px; 
-	-moz-background-clip: -moz-initial; 
-	-moz-background-origin: -moz-initial; 
-	-moz-background-inline-policy: -moz-initial; 
-	font-weight: bold;
-}
-
-.search-img {
-	width: 61px; 
-	height: 18px; 
-	position: absolute; 
-	top: 20px; 
-	left: 261px;
-}
-
-.search-option-div {
-	position: absolute; 
-	top: 41px; 
-	left: 197px;
-}
-
-.search-option-link {
-	color: rgb(255, 255, 255); 
-	text-decoration: none;
-}
-
-.search-options {
-	background: transparent none repeat scroll 0% 0%; 
-	overflow: hidden; 
-	height: 110px; 
-	width: 327px; 
-	position: absolute; 
-	top: 107px; 
-	right: 5px; 
-	-moz-background-clip: -moz-initial; 
-	-moz-background-origin: -moz-initial; 
-	-moz-background-inline-policy: -moz-initial; 
-}
-
-.search-option-img {
-	position: absolute; 
-	bottom: 0px; 
-	left: 0px;
-}
-
-.search-options-div1 {
-	position: absolute; 
-	color: white; 
-	top: 7px; 
-	left: 45px;
-}
-
-.search-options-div2 {
-	border-top: 1px solid rgb(56, 56, 56); 
-	position: absolute; 
-	color: white; 
-	top: 32px; 
-	padding-top: 3px; 
-	left: 38px;
-}
-
-.search-hide-options-div {
-	position: absolute; 
-	bottom: 5px; 
-	left: 163px;
-}
-
-.search-hide-options-link {
-	color: rgb(255, 255, 255); 
-	text-decoration: none;
-}
-
-.dr-tree-h-text {
-	white-space: normal;
-}
-
-.tree-selected-node{
-	font-weight: bold;
-	background: #F1F1F1;
-	border: #FFFFFF 1px solid;
-}
-
-.dr-tree-h-ic-div {
-	margin: 0px;
-	padding-left: 0px;
-	padding-bottom: 5px;
-}
-
-.avatar {
-	width: 100px;
-}
-
-.rich-tree-node rich-cm-attached {
-	padding-top: 3px;
-}
-
-.dr-tree-h-ic-img{
-	width: 25px; 
-}
-
-.dr-insldr-vert-spacer {
-	padding: 0px;
-}
-
-.shelf-header-table{
-	border-collapse : collapse; 
-	margin-bottom : 15px;
-}
-
-.shelf-header-table h1{
-	margin-bottom : 4px;
-}
-
-.shelf-header-table-col2{
-	padding : 8px 0px 0px 20px; 
-	vertical-align : top; 
-	white-space : nowrap;
-}
-
-.additional-info-text{
-	color : #666666;
-}
-
-.additional-info-avatar {
-	width: 80px; 
-	height: 80px;
-	border:0px;
-}
-
-.additional-info-comment-del {
-	float : right; 
-	cursor : pointer
-}
-
-.album-header-table{
-	border-collapse : collapse; 
-	margin-bottom : 15px;
-}
-
-.album-header-table h1{
-	margin-bottom : 4px;
-}
-
-.album-header-table-col2{
-	padding : 8px 0px 0px 20px; 
-	vertical-align : top; 
-	white-space : nowrap;
-}
-
-.album-cover-image{
-	border : 1px solid #FFFFFF;
-}
-
-.image-header-table{
-	border-collapse : collapse; 
-	margin-bottom : 15px;
-}
-
-.image-header-table h1{
-	margin-bottom : 4px;
-}
-
-.image-header-table-col2{
-	padding : 8px 0px 0px 20px; 
-	vertical-align : top; 
-	white-space : nowrap;
-}
-
-.image-cover-image{
-	border : 2px solid #FFFFFF;
-}
-
-.mainImage-div{
-	padding-top : 10px;
-}
-
-.mainImage-table{
-	border-collapse : collapse; 
-	margin-bottom : 5px;
-}
-
-.mainImage-table-col1{
-	padding-right : 10px; 
-	padding-left : 30px; 
-	text-align : right;
-}
-
-.mainImage-table-col3{
-	padding-bottom : 5px
-}
-
-.buttons-body{
-	cursor : pointer; 
-	margin : 0px 0px 0px 0px; 
-	position : relative; 
-	width : 103px; 
-	height : 28px;
-}
-
-.buttons-body-image{
-	position : absolute; 
-	top : 0px; 
-	left : 0px; 
-	border: 0px;
-}
-.buttons-body-text-div{
-	position : absolute; 
-	color : #ffffff; 
-	top : 7px; 
-	left : 8px;
-}
-.buttons-body-spacer-image{
-	position : absolute; 
-	top : 0px; 
-	left : 0px;
-	border: 0px;
-}
-
-.slideshow-outerdiv{
-	cursor : pointer; 
-	margin-bottom : 7px
-}
-
-.comment-table{
-	border-collapse : collapse; 
-	margin-bottom : 20px;
-}
-.comment-deleteLink{
-	margin : 1px 0px 7px 0px; 
-	background : #f1f1f1; 
-	padding : 3px 4px 4px 4px;
-}
-.comment-text{
-	margin : 0px 0px 10px 0px; 
-	padding : 0px 4px 0px 4px;
-}
-
-.image-edit-div{
-	margin : 10px 0px 30px 30px; 
-	width : 504px; 
-	background : #f1f1f1;
-}
-.image-edit-div-table{
-	border-collapse : collapse;
-}
-
-.image-edit-label {
-	padding-top : 8px;
-}
-
-.image-edit-photo-input {
-	border : 1px solid #999999; 
-	width : 350px;
-}
-
-.image-edit-calendar {
-	border : 1px solid #999999; 
-	width : 80px;
-}
-
-.image-edit-description-input {
-	border : 1px solid #999999; 
-	width : 350px; 
-	height : 150px;
-}
-
-.image-edit-tags-input {
-	border : 1px solid #999999; 
-	width : 150px; 
-	margin-bottom : 4px;
-}
-
-.image-edit-direct-link {
-	border : 0px; 
-	background : none; 
-	width : 350px
-}
-
-.main-menu-icons-outer-div {
-	cursor: pointer;
-	float: left;
-	padding: 4px 2px 0px 2px;
-}
-
-.main-menu-icons-left-div {
-	height: 23px;
-	float: left;
-}
-
-.main-menu-icons-middle-div {
-	height: 23px;
-	float: left;
-	background: url(../img/shell/informer_bg.png) top left no-repeat;
-	color: #FFFFFF;
-	padding: 4px 0px 0px 0px;
-}
-
-.main-menu-icons-right-div {
-	height : 23px; 
-	float : left; 
-	width : 10px; 
-	overflow : hidden; 
-	position : relative;
-}
-.main-menu-icons-backgroung-img {
-	position : absolute; 
-	top : 0px; 
-	right : 0px; 
-	border: 0px;
-}
-.main-menu-separator-img{
-	float:left; 
-	margin : 8px 15px 0px 15px;
-	border : 0px;
-}
-.main-menu-add-icons-img{
-	padding : 4px 0px 0px 5px;
-	border : 0px;
-}
-
-.rich-tabpanel-content{
-	border: none;
-	background: none;
-}
-.rich-tabhdr-side-cell{
-	border: none;	
-}
-.rich-tabhdr-side-border{
-	border: none;
-	background: none;
-}
-.rich-tab-bottom-line{
-	border: none;
-	background: none;
-}
-
-.rich-tab-active{
-	border-right: 1px solid;
-	border-right-color: black;
-	border-left: 0px;
-	border-top: 0px;
-	font-size : 175%; 
-	background: none;
-	font-weight : normal; 
-	margin : 4px;
-}
-
-.rich-tab-inactive{
-	border-right: 1px solid;
-	border-right-color: black;
-	border-left: 0px;
-	border-top: 0px;
-	background: none;
-	color : #DF6400;
-	text-decoration: underline;
-	cursor: pointer;
-}
-
-.top-right-bottom-menu-item {
-	vertical-align: top;
-	padding: 0px;
-}
-
-.top-right-bottom-menu-item-link a{
-	font-size: 11px;
-	color: #ffffff;
-	text-decoration: none;
-	font-weight: normal;
-	padding: 0px 0px 0px 15px;
-}
-.slideshow-link{
-	color:black;
-	text-decoration:none;
-}
-
-
-.realworldButton {
-	margin: 0px 0px 0px 0px; 
-	position: relative; 
-	width: 103px; 
-	height: 28px;
-	cursor: pointer;
-}
-
-.realworldButton input, .realworldButton img {
-	position: absolute; 
-	top: 0px; 
-	left: 0px;
-	width: 103px;
-	height: 28px;
-}
-
-.realworldButton img {
-	border-width: 0px;
-}
-
-.realworldButton input {
-	outline-style: none;
-}
-
-.realworldButton div {
-	position: absolute; 
-	color: #ffffff; 
-	top: 7px; 
-	left: 0px; 
-	width: 103px; 
-	text-align: center; 
-}
-
-.album-edit-field {
-	padding-top : 8px
-}
-
-.album-edit-calendar {
-	border : 1px solid #999999; 
-	width : 80px
-}
-
-.album-edit-input {
-	border : 1px solid #999999; 
-	width : 350px
-}
-	
-.album-edit-area {
-	border : 1px solid #999999; 
-	width : 350px; 
-	height : 150px;
-}
-
-.search-criteria {
-	color: #666666;
-}
-
-.shelf-edit {
-	margin : 10px 0px 30px 30px; 
-	width : 504px; 
-	background : #f1f1f1;
-}
-
-.shelf-edit-calendar {
-	border : 1px solid #999999; 
-	width : 80px;
-}
-
-.shelf-edit-input {
-	border : 1px solid #999999; 
-	width : 350px;
-}
-
-.shelf-edit-area {
-	border : 1px solid #999999; 
-	width : 350px; 
-	height : 150px
-}
-
-.tag-panel {
-	border: 0px; 
-	background: none; 
-	overflow: auto;
-}
-
-.tag-table {
-	float: left; 
-	margin: 0px 10px 10px 0px;
-}
-
-.tag-table-td {
-	text-align: center; 
-	vertical-align: middle; 
-	background: white; 
-	border: 1px solid #909090;
-}
-
-.reg-table{
-	padding : 0px 10px 10px 0px;
-}
-
-.reg-table-col1{
-	vertical-align : top;
-}
-.reg-table-col3{
-	vertical-align : top;
-}
-.reg-table-input{
-	border : 1px solid #909090; 
-	height : 19px; 
-	width : 155px
-}
-.reg-table-output{
-	height : 19px; 
-	width : 155px;
-	padding: 5px;
-	font-weight: bold;
-}
-
-.slideshow-table{
-	width: 100%;
-	height: 100%;
-}
-
-.slideshow-table-col{
-	text-align: center;
-}
-
-.slideshow-table-row{
-	vertical-align: middle;
-}
-
-.rich-menu-item-icon img{
-	border:0px;
-}
-
-.rich-inplace {
-	font-size: inherit;
-}
\ No newline at end of file




More information about the richfaces-svn-commits mailing list