[richfaces-svn-commits] JBoss Rich Faces SVN: r12108 - in trunk/test-applications/realworld: Upload/amarkhel/Cars and 23 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Jan 5 11:44:22 EST 2009
Author: amarkhel
Date: 2009-01-05 11:44:21 -0500 (Mon, 05 Jan 2009)
New Revision: 12108
Added:
trunk/test-applications/realworld/Upload/amarkhel/Cars/Pagani_Zonda_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/Pagani_Zonda_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/aston_martin_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/aston_martin_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/ferrari_profile_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/ferrari_profile_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/holden-efijy-1809_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/holden-efijy-1809_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/hulme_supercar_side_parked_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/hulme_supercar_side_parked_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/spadaconcept codatronca_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/spadaconcept codatronca_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/supercar_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Cars/supercar_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Audrey_Tautou_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Audrey_Tautou_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Juliette_Binoche_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Juliette_Binoche_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Penelope_Cruz_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Penelope_Cruz_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Rihanna_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Rihanna_mini.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Uma_Turman_medium.jpg
trunk/test-applications/realworld/Upload/amarkhel/Tetki/Uma_Turman_mini.jpg
trunk/test-applications/realworld/Upload/galleries/
trunk/test-applications/realworld/Upload/galleries/Fun/
trunk/test-applications/realworld/Upload/galleries/Fun/img-20d46.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-20d46_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-25386.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-25386_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-2e015.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-2e015_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-31c2e.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-31c2e_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-334ee.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-334ee_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-6537e.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-6537e_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-69fe6.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-69fe6_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-7141c.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-7141c_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-828dd.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-828dd_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-99215.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-99215_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-9b1c2.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-9b1c2_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-a9307.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-a9307_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-b8d37.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-b8d37_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-be1c0.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-be1c0_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-cf3ee.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-cf3ee_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ada.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ada_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ed3.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ed3_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-d966e.jpg
trunk/test-applications/realworld/Upload/galleries/Fun/img-d966e_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/
trunk/test-applications/realworld/Upload/galleries/Sport/1.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/10.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/10_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/11.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/11_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/12.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/12_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/13.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/13_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/14.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/14_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/15.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/15_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/16.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/16_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/17.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/17_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/1_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/2.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/2_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/3.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/3_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/4.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/4_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/5.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/5_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/6.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/6_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/7.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/7_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/8.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/8_mini.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/9.jpg
trunk/test-applications/realworld/Upload/galleries/Sport/9_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/Haruki_Murakami_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/Haruki_Murakami_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/Japanese_Street_Fashion_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/Japanese_Street_Fashion_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/Kendo_Championship_2006_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/Kendo_Championship_2006_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/birds_fly_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/birds_fly_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/live_in_piece_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/live_in_piece_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/modern_japanesse_family_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/modern_japanesse_family_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/zen-garden_landscape_design_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Japan/zen-garden_landscape_design_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/Babkin_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/Babkin_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/Bob_Marley_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/Bob_Marley_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/Infected_Mushroom_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/Infected_Mushroom_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/StreetMusician_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/StreetMusician_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/massiveAttack_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/massiveAttack_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/system-of-a-down_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/system-of-a-down_mini.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/tobin_medium.jpg
trunk/test-applications/realworld/Upload/qqqq/Music/tobin_mini.jpg
trunk/test-applications/realworld/Upload/root/Avatars/pupkind_medium.jpg
trunk/test-applications/realworld/Upload/root/Avatars/pupkind_mini.jpg
trunk/test-applications/realworld/Upload/root/Avatars/pupkind_mini_medium.jpg
trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer_medium.jpg
trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer_mini.jpg
trunk/test-applications/realworld/Upload/root/Football/Soccer_medium.jpg
trunk/test-applications/realworld/Upload/root/Football/Soccer_mini.jpg
trunk/test-applications/realworld/Upload/root/Football/bdysch!!!_medium.jpg
trunk/test-applications/realworld/Upload/root/Football/bdysch!!!_mini.jpg
trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0_medium.jpg
trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0_mini.jpg
trunk/test-applications/realworld/Upload/root/Football/flag_football_medium.jpg
trunk/test-applications/realworld/Upload/root/Football/flag_football_mini.jpg
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Gallery.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/GalleryImage.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/GalleryAction.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IGalleryAction.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/FileHelper.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/WebUtil.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/LinkBuilder.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/test.java
trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/fileUploadPanel.xhtml
Removed:
trunk/test-applications/realworld/Upload/root/Football/Soccer416x594.jpg
Modified:
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld/ejb/src/main/resources/import.sql
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationHelper.java
trunk/test-applications/realworld/web/src/main/resources/messages_en.properties
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml
trunk/test-applications/realworld/web/src/main/webapp/img/Thumbs.db
trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld/web/src/main/webapp/main.xhtml
Log:
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/Pagani_Zonda_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/Pagani_Zonda_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/Pagani_Zonda_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/Pagani_Zonda_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/aston_martin_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/aston_martin_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/aston_martin_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/aston_martin_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/ferrari_profile_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/ferrari_profile_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/ferrari_profile_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/ferrari_profile_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/holden-efijy-1809_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/holden-efijy-1809_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/holden-efijy-1809_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/holden-efijy-1809_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/hulme_supercar_side_parked_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/hulme_supercar_side_parked_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/hulme_supercar_side_parked_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/hulme_supercar_side_parked_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/spadaconcept codatronca_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/spadaconcept codatronca_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/spadaconcept codatronca_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/spadaconcept codatronca_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/supercar_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/supercar_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Cars/supercar_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Cars/supercar_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Audrey_Tautou_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Audrey_Tautou_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Audrey_Tautou_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Audrey_Tautou_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Juliette_Binoche_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Juliette_Binoche_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Juliette_Binoche_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Juliette_Binoche_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Penelope_Cruz_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Penelope_Cruz_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Penelope_Cruz_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Penelope_Cruz_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Rihanna_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Rihanna_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Rihanna_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Rihanna_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Uma_Turman_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Uma_Turman_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Uma_Turman_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/amarkhel/Tetki/Uma_Turman_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-20d46.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-20d46.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-20d46_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-20d46_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-25386.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-25386.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-25386_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-25386_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-2e015.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-2e015.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-2e015_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-2e015_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-31c2e.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-31c2e.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-31c2e_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-31c2e_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-334ee.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-334ee.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-334ee_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-334ee_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-6537e.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-6537e.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-6537e_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-6537e_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-69fe6.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-69fe6.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-69fe6_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-69fe6_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-7141c.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-7141c.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-7141c_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-7141c_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-828dd.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-828dd.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-828dd_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-828dd_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-99215.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-99215.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-99215_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-99215_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-9b1c2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-9b1c2.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-9b1c2_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-9b1c2_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-a9307.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-a9307.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-a9307_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-a9307_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-b8d37.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-b8d37.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-b8d37_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-b8d37_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-be1c0.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-be1c0.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-be1c0_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-be1c0_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-cf3ee.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-cf3ee.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-cf3ee_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-cf3ee_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ada.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ada.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ada_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ada_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ed3.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ed3.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ed3_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-d5ed3_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-d966e.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-d966e.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Fun/img-d966e_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Fun/img-d966e_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/1.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/1.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/10.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/10.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/10_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/10_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/11.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/11.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/11_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/11_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/12.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/12.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/12_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/12_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/13.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/13.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/13_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/13_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/14.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/14.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/14_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/14_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/15.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/15.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/15_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/15_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/16.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/16.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/16_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/16_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/17.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/17.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/17_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/17_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/1_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/1_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/2.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/2_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/2_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/3.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/3.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/3_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/3_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/4.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/4.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/4_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/4_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/5.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/5.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/5_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/5_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/6.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/6.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/6_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/6_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/7.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/7.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/7_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/7_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/8.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/8.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/8_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/8_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/9.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/9.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/galleries/Sport/9_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/galleries/Sport/9_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/Haruki_Murakami_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/Haruki_Murakami_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/Haruki_Murakami_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/Haruki_Murakami_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/Japanese_Street_Fashion_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/Japanese_Street_Fashion_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/Japanese_Street_Fashion_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/Japanese_Street_Fashion_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/Kendo_Championship_2006_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/Kendo_Championship_2006_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/Kendo_Championship_2006_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/Kendo_Championship_2006_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/birds_fly_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/birds_fly_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/birds_fly_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/birds_fly_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/live_in_piece_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/live_in_piece_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/live_in_piece_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/live_in_piece_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/modern_japanesse_family_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/modern_japanesse_family_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/modern_japanesse_family_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/modern_japanesse_family_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/zen-garden_landscape_design_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/zen-garden_landscape_design_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Japan/zen-garden_landscape_design_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Japan/zen-garden_landscape_design_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/Babkin_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/Babkin_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/Babkin_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/Babkin_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/Bob_Marley_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/Bob_Marley_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/Bob_Marley_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/Bob_Marley_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/Infected_Mushroom_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/Infected_Mushroom_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/Infected_Mushroom_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/Infected_Mushroom_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/StreetMusician_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/StreetMusician_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/StreetMusician_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/StreetMusician_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/massiveAttack_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/massiveAttack_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/massiveAttack_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/massiveAttack_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/system-of-a-down_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/system-of-a-down_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/system-of-a-down_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/system-of-a-down_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/tobin_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/tobin_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/qqqq/Music/tobin_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/qqqq/Music/tobin_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Avatars/pupkind_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Avatars/pupkind_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Avatars/pupkind_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Avatars/pupkind_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Avatars/pupkind_mini_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Avatars/pupkind_mini_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Deleted: trunk/test-applications/realworld/Upload/root/Football/Soccer416x594.jpg
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld/Upload/root/Football/Soccer_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/Soccer_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/Soccer_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/Soccer_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/bdysch!!!_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/bdysch!!!_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/bdysch!!!_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/bdysch!!!_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/flag_football_medium.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/flag_football_medium.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/Upload/root/Football/flag_football_mini.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/flag_football_mini.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Gallery.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Gallery.java (rev 0)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Gallery.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,113 @@
+package org.richfaces.realworld.domain;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotEmpty;
+import org.hibernate.validator.NotNull;
+import org.jboss.seam.annotations.Name;
+
+ at Entity
+ at Name("gallery")
+ at Table(name = "galleries")
+public class Gallery implements Serializable {
+
+ private static final long serialVersionUID = -7042878411608396483L;
+
+ @Id
+ @GeneratedValue
+ @Column(name = "GALLERY_ID")
+ private Long id = null;
+
+ @Column(length = 255, nullable = false)
+ @NotNull
+ @NotEmpty
+ @Length(min=3)
+ private String name;
+
+ @OneToMany(cascade = CascadeType.ALL, mappedBy = "gallery")
+ @org.hibernate.annotations.OrderBy(clause = "uploaded desc")
+ @org.hibernate.annotations.Fetch(org.hibernate.annotations.FetchMode.SUBSELECT)
+ private List<GalleryImage> images = new ArrayList<GalleryImage>();
+
+ /**
+ * Getter for property id
+ *
+ * @return id of album
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * Getter for property name
+ *
+ * @return name of album
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Setter for property name
+ *
+ * @param name - name of album
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * This method add image to collection of images of current album
+ *
+ * @param image - image to add
+ */
+ public void addImage(GalleryImage image) {
+ if (image == null) {
+ throw new IllegalArgumentException("Null image!");
+ }
+ if (image.getGallery() != null && !this.equals(image.getGallery())) {
+ image.getGallery().getImages().remove(image);
+ }
+ image.setGallery(this);
+ images.add(image);
+ }
+
+ /**
+ * This method remove image from collection of images of album
+ *
+ * @param image - image to remove
+ */
+ public void removeImage(GalleryImage image) {
+ if (image == null) {
+ throw new IllegalArgumentException("Null image");
+ }
+ image.setGallery(null);
+ images.remove(image);
+ }
+
+ /**
+ * This method return count of images of current album
+ *
+ * @return count of images of this album
+ */
+ public int getCountImages() {
+ return this.getImages()!= null ? this.getImages().size() : 0;
+
+ }
+
+ public List<GalleryImage> getImages() {
+ return images;
+ }
+
+}
Property changes on: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Gallery.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/GalleryImage.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/GalleryImage.java (rev 0)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/GalleryImage.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,157 @@
+package org.richfaces.realworld.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotEmpty;
+import org.hibernate.validator.NotNull;
+import org.jboss.seam.annotations.Name;
+
+ at Entity
+ at Name("galleryImage")
+ at Table(name = "galleryImages")
+public class GalleryImage implements Serializable {
+
+ private static final long serialVersionUID = -7042878411608396483L;
+
+ @Id
+ @GeneratedValue
+ @Column(name = "GALLERY_IMAGE_ID")
+ private Long id = null;
+
+ @Column(length = 255)
+ private String name;
+
+ @Column(length = 1024)
+ private String path;
+
+ @Column(length = 255)
+ private String cameraModel;
+
+ @Column(length = 255)
+ private String author;
+
+ private int height;
+
+ private double size;
+
+ private int width;
+
+ @Column(length = 1024)
+ private String description;
+
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date created;
+
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date uploaded;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name="IMG_GALLERY_ID",
+ referencedColumnName="GALLERY_ID")
+ private Gallery gallery;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCameraModel() {
+ return cameraModel;
+ }
+
+ public void setCameraModel(String cameraModel) {
+ this.cameraModel = cameraModel;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public Gallery getGallery() {
+ return gallery;
+ }
+
+ public void setGallery(Gallery gallery) {
+ this.gallery = gallery;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public Date getUploaded() {
+ return uploaded;
+ }
+
+ public void setUploaded(Date uploaded) {
+ this.uploaded = uploaded;
+ }
+
+ public double getSize() {
+ return size;
+ }
+
+ public void setSize(double size) {
+ this.size = size;
+ }
+}
Property changes on: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/GalleryImage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -64,6 +64,18 @@
@Length(min=3)
private String path;
+ @Column(length = 255)
+ private String cameraModel;
+
+ private int height;
+
+ private double size;
+
+ private int width;
+
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date uploaded;
+
@OneToOne
@JoinColumn(name="RANK_ID")
private Rank rank;
@@ -267,4 +279,44 @@
public void setMeta(List<MetaTag> meta) {
this.meta = meta;
}
+
+ public String getCameraModel() {
+ return cameraModel;
+ }
+
+ public void setCameraModel(String cameraModel) {
+ this.cameraModel = cameraModel;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public double getSize() {
+ return size;
+ }
+
+ public void setSize(double size) {
+ this.size = size;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public Date getUploaded() {
+ return uploaded;
+ }
+
+ public void setUploaded(Date uploaded) {
+ this.uploaded = uploaded;
+ }
}
Added: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/GalleryAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/GalleryAction.java (rev 0)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/GalleryAction.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,45 @@
+package org.richfaces.realworld.service;
+
+import java.util.List;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.richfaces.realworld.domain.Gallery;
+import org.richfaces.realworld.domain.GalleryImage;
+
+ at Name("galleryAction")
+ at Stateless
+public class GalleryAction implements IGalleryAction {
+
+ @In(value="entityManager")
+ EntityManager em;
+ /* (non-Javadoc)
+ * @see org.richfaces.realworld.service.IGalleryAction#addGallery(java.lang.String)
+ */
+ public void addGallery(String name){
+ Gallery gal = new Gallery();
+ gal.setName(name);
+ em.persist(gal);
+ em.flush();
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.realworld.service.IGalleryAction#addmage(org.richfaces.realworld.domain.Gallery, org.richfaces.realworld.domain.GalleryImage)
+ */
+ public void addImage(Gallery gallery, GalleryImage image){
+ gallery.addImage(image);
+ em.flush();
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.realworld.service.IGalleryAction#getGalleries()
+ */
+ public List<Gallery> getGalleries(){
+ List<Gallery> galleries = em.createQuery("from Gallery")
+ .getResultList();
+ return galleries;
+ }
+}
Property changes on: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/GalleryAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IGalleryAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IGalleryAction.java (rev 0)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IGalleryAction.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,19 @@
+package org.richfaces.realworld.service;
+
+import java.util.List;
+
+import javax.ejb.Local;
+
+import org.richfaces.realworld.domain.Gallery;
+import org.richfaces.realworld.domain.GalleryImage;
+
+ at Local
+public interface IGalleryAction {
+
+ public abstract void addGallery(String name);
+
+ public abstract void addImage(Gallery gallery, GalleryImage image);
+
+ public abstract List<Gallery> getGalleries();
+
+}
\ No newline at end of file
Property changes on: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/IGalleryAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/realworld/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/resources/import.sql 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/ejb/src/main/resources/import.sql 2009-01-05 16:44:21 UTC (rev 12108)
@@ -38,37 +38,37 @@
INSERT INTO Ranks(rank_id, total, hits) VALUES (30, 100, 30);
INSERT INTO Ranks(rank_id, total, hits) VALUES (31, 110, 31);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (1, 'Aston Martin', 'amarkhel/Cars/aston_martin.jpg', 'Where is the Batman?', '2008-12-18', 1, 1);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (2, 'Ferrari', 'amarkhel/Cars/ferrari_profile.jpg', 'Beauty!', '2008-12-18', 1, 2);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (3, 'Australian supercar', 'amarkhel/Cars/holden-efijy-1809.jpg', 'This one glitters in my garage ;)', '2008-12-18', 1, 3);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (4, 'Hulme Supercar', 'amarkhel/Cars/hulme_supercar_side_parked.jpg', 'Saw it in Germany in summer 2007', '2008-12-18', 1, 4);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (5, 'Pagani Zonda', 'amarkhel/Cars/Pagani_Zonda.jpg', 'The picture is provided by my friend photographer', '2008-12-18', 1, 5);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (6, 'Codatronca (concept)', 'amarkhel/Cars/spadaconcept codatronca.jpg', 'Just concept', '2008-12-18', 1, 6);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (7, 'Unknown supercar', 'amarkhel/Cars/supercar.jpg', 'Tell me it name if you know', '2008-12-18', 1, 7);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (8, 'Audrey Tautou', 'amarkhel/Tetki/Audrey_Tautou.jpg', 'Pretty girl!', '2008-12-18', 2, 8);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (9, 'Juliette Binoche', 'amarkhel/Tetki/Juliette_Binoche.jpg', 'Saw her in "Chocolate" at first', '2008-12-18', 2, 9);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (10, 'Penelope Cruz', 'amarkhel/Tetki/Penelope_Cruz.jpg', 'Without comments', '2008-12-18', 2, 10);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (11, 'Rihanna', 'amarkhel/Tetki/Rihanna.jpg', 'Was born in Barbados. True or false?', '2008-12-18', 2, 11);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (12, 'Uma Turman', 'amarkhel/Tetki/Uma_Turman.jpg', 'Share the delight with Tarantino )', '2008-12-18', 2, 12);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (13, 'Basketball soccer', 'root/Football/Basketball_soccer.jpg', 'They never saw camera', '2008-12-18', 3, 13);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (14, 'bdysch!!!', 'root/Football/bdysch!!!.jpg', 'Dermo sluchaetsia', '2008-12-18', 3, 14);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (15, 'Training', 'root/Football/euro2008_holland_wideweb__470x321,0.jpg', ' ) ', '2008-12-18', 3, 15);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (16, 'Also football', 'root/Football/flag_football.jpg', 'This is also football, but I do not understand it at all', '2008-12-18', 3, 16);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (17, 'Soccer', 'root/Football/soccer.jpg', 'Soccer differs from football', '2008-12-18', 3, 17);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (18, 'from birds fly', 'qqqq/Japan/birds_fly.jpg', 'One of the megalopolices', '2008-12-18', 4, 18);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (19, 'Haruki Murakami', 'qqqq/Japan/Haruki_Murakami.jpg', 'World famous aouthor', '2008-12-18', 4, 19);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (20, 'Street fashion', 'qqqq/Japan/Japanese_Street_Fashion.jpg', 'Venture to walk in such in our streets?', '2008-12-18', 4, 20);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (21, 'Kendo Championship', 'qqqq/Japan/Kendo_Championship_2006.jpg', 'Samurais steel alive!', '2008-12-18', 4, 21);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (22, 'Live in peace', 'qqqq/Japan/live_in_piece.jpg', 'The best place for meditation', '2008-12-18', 4, 22);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (23, 'Modern family', 'qqqq/Japan/modern_japanesse_family.jpg', 'Where is his mother?!', '2008-12-18', 4, 23);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (24, 'Zen garden', 'qqqq/Japan/zen-garden_landscape_design.jpg', 'Fen Shui i vsia fignia', '2008-12-18', 4, 24);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (25, 'Sergei Babkin', 'qqqq/Music/Babkin.jpg', 'Also plays in theatre', '2008-12-18', 5, 25);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (26, 'Bob Marley', 'qqqq/Music/Bob_Marley.jpg', 'Everyone should know him', '2008-12-18', 5, 26);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (27, 'Infected Mushroom', 'qqqq/Music/Infected_Mushroom.jpg', 'Famous psyhedelic trance group from Israel', '2008-12-18', 5, 27);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (28, 'Massive Attack', 'qqqq/Music/massiveAttack.jpg', 'They play theme to "House"', '2008-12-18', 5, 28);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (29, 'Street musician', 'qqqq/Music/StreetMusician.jpg', 'unknown musician', '2008-12-18', 5, 29);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (30, 'SOAD', 'qqqq/Music/system-of-a-down.jpg', 'Try not to loose your innervision!', '2008-12-18', 5, 30);
-INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id) VALUES (31, 'Amon Tobin', 'qqqq/Music/tobin.jpg', 'Brasilian, works in London. Try his "Supermodified2000" album', '2008-12-18', 5, 31);
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (1, 'Aston Martin', 'amarkhel/Cars/aston_martin.jpg', 'Where is the Batman?', '2008-12-18', 1, 1,'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (2, 'Ferrari', 'amarkhel/Cars/ferrari_profile.jpg', 'Beauty!', '2008-12-18', 1, 2,'Canon S3', 500, 37.5, 314, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (3, 'Australian supercar', 'amarkhel/Cars/holden-efijy-1809.jpg', 'This one glitters in my garage ;)', '2008-12-18', 1, 3,'Canon S3', 450, 28.1, 221, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (4, 'Hulme Supercar', 'amarkhel/Cars/hulme_supercar_side_parked.jpg', 'Saw it in Germany in summer 2007', '2008-12-18', 1, 4,'Canon S3', 500, 39.8, 239, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (5, 'Pagani Zonda', 'amarkhel/Cars/Pagani_Zonda.jpg', 'The picture is provided by my friend photographer', '2008-12-18', 1, 5,'Canon S3', 500, 49.6, 338, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (6, 'Codatronca (concept)', 'amarkhel/Cars/spadaconcept codatronca.jpg', 'Just concept', '2008-12-18', 1, 6,'Canon S3', 560, 21.7, 360, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (7, 'Unknown supercar', 'amarkhel/Cars/supercar.jpg', 'Tell me it name if you know', '2008-12-18', 1, 7,'Canon S3', 480, 29.7, 360, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (8, 'Audrey Tautou', 'amarkhel/Tetki/Audrey_Tautou.jpg', 'Pretty girl!', '2008-12-18', 2, 8,'Canon S3', 396, 34.7, 500, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (9, 'Juliette Binoche', 'amarkhel/Tetki/Juliette_Binoche.jpg', 'Saw her in "Chocolate" at first', '2008-12-18', 2, 9,'Canon S3', 400, 44.9, 500, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (10, 'Penelope Cruz', 'amarkhel/Tetki/Penelope_Cruz.jpg', 'Without comments', '2008-12-18', 2, 10,'Canon S3', 500, 41.7, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (11, 'Rihanna', 'amarkhel/Tetki/Rihanna.jpg', 'Was born in Barbados. True or false?', '2008-12-18', 2, 11,'Canon S3', 375, 52.5, 500, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (12, 'Uma Turman', 'amarkhel/Tetki/Uma_Turman.jpg', 'Share the delight with Tarantino )', '2008-12-18', 2, 12,'Canon S3', 368, 40.2, 500, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (13, 'Basketball soccer', 'root/Football/Basketball_soccer.jpg', 'They never saw camera', '2008-12-18', 3, 13,'Canon S3', 500, 33.1, 374, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (14, 'bdysch!!!', 'root/Football/bdysch!!!.jpg', 'Dermo sluchaetsia', '2008-12-18', 3, 14,'Canon S3', 500, 50.4, 333, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (15, 'Training', 'root/Football/euro2008_holland_wideweb__470x321,0.jpg', ' ) ', '2008-12-18', 3, 15,'Canon S3', 470, 37.3, 331, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (16, 'Also football', 'root/Football/flag_football.jpg', 'This is also football, but I do not understand it at all', '2008-12-18', 3, 16,'Canon S3', 500, 24.4, 333, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (17, 'Soccer', 'root/Football/soccer.jpg', 'Soccer differs from football', '2008-12-18', 3, 17,'Canon S3', 350, 45.3, 500, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (18, 'from birds fly', 'qqqq/Japan/birds_fly.jpg', 'One of the megalopolices', '2008-12-18', 4, 18,'Canon S3', 500, 53.4, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (19, 'Haruki Murakami', 'qqqq/Japan/Haruki_Murakami.jpg', 'World famous aouthor', '2008-12-18', 4, 19,'Canon S3', 500, 36, 376, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (20, 'Street fashion', 'qqqq/Japan/Japanese_Street_Fashion.jpg', 'Venture to walk in such in our streets?', '2008-12-18', 4, 20,'Canon S3', 367, 59.2, 500, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (21, 'Kendo Championship', 'qqqq/Japan/Kendo_Championship_2006.jpg', 'Samurais steel alive!', '2008-12-18', 4, 21,'Canon S3', 500, 48.7, 332, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (22, 'Live in peace', 'qqqq/Japan/live_in_piece.jpg', 'The best place for meditation', '2008-12-18', 4, 22,'Canon S3', 500, 42.7, 398, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (23, 'Modern family', 'qqqq/Japan/modern_japanesse_family.jpg', 'Where is his mother?!', '2008-12-18', 4, 23,'Canon S3', 500, 43.1, 500, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (24, 'Zen garden', 'qqqq/Japan/zen-garden_landscape_design.jpg', 'Fen Shui i vsia fignia', '2008-12-18', 4, 24,'Canon S3', 500, 46.1, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (25, 'Sergei Babkin', 'qqqq/Music/Babkin.jpg', 'Also plays in theatre', '2008-12-18', 5, 25,'Canon S3', 525, 59.5, 350, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (26, 'Bob Marley', 'qqqq/Music/Bob_Marley.jpg', 'Everyone should know him', '2008-12-18', 5, 26,'Canon S3', 496, 41.7, 384, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (27, 'Infected Mushroom', 'qqqq/Music/Infected_Mushroom.jpg', 'Famous psyhedelic trance group from Israel', '2008-12-18', 5, 27,'Canon S3', 500, 35.4, 334, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (28, 'Massive Attack', 'qqqq/Music/massiveAttack.jpg', 'They play theme to "House"', '2008-12-18', 5, 28,'Canon S3', 500, 47.4, 377, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (29, 'Street musician', 'qqqq/Music/StreetMusician.jpg', 'unknown musician', '2008-12-18', 5, 29,'Canon S3', 336, 60.5, 500, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (30, 'SOAD', 'qqqq/Music/system-of-a-down.jpg', 'Try not to loose your innervision!', '2008-12-18', 5, 30,'Canon S3', 500, 39.5, 323, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, rank_id, cameraModel, height, size, width, uploaded) VALUES (31, 'Amon Tobin', 'qqqq/Music/tobin.jpg', 'Brasilian, works in London. Try his "Supermodified2000" album', '2008-12-18', 5, 31,'Canon S3', 450, 37, 302, '2008-12-01');
INSERT INTO metatags(metatag_id, tag, image_metatag_id) VALUES (1, 'Cool', 1);
INSERT INTO metatags(metatag_id, tag, image_metatag_id) VALUES (2, 'Cool2', 1);
INSERT INTO metatags(metatag_id, tag, image_metatag_id) VALUES (3, 'richfaces', 2);
@@ -97,4 +97,42 @@
INSERT INTO shared_albums(album_id, user_id) VALUES(4, 1);
INSERT INTO shared_albums(album_id, user_id) VALUES(5, 1);
INSERT INTO user_friends(user1_id, user2_id) VALUES(1, 2);
-INSERT INTO friendship_requests(REQUEST_ID, USER_ID, FRIEND_ID) VALUES(1, 3, 1);
\ No newline at end of file
+INSERT INTO friendship_requests(REQUEST_ID, USER_ID, FRIEND_ID) VALUES(1, 3, 1);
+INSERT INTO galleries(GALLERY_ID, name) VALUES (1, 'Fun');
+INSERT INTO galleries(GALLERY_ID, name) VALUES (2, 'Sport');
+INSERT INTO galleries(GALLERY_ID, name) VALUES (3, 'Nature');
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (1, 'Picture1','Fun/img-2e015.jpg' ,'Canon ES3', 'Nick', 1280, 145, 1024, 'Description', '1985-01-08', '2008-21-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (2, 'Picture2', 'Fun/img-9b1c2.jpg','Canon ES3', 'Nick', 1024, 129, 768, 'Description', '1985-01-08', '2008-22-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (3, 'Picture3', 'Fun/img-20d46.jpg','Canon ES3', 'Andrey', 1600, 260, 1200, 'Description', '1985-01-08', '2008-23-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (4, 'Picture4','Fun/img-31c2e.jpg' ,'Canon ES3', 'Ilya', 1280, 169, 1024, 'Description', '1985-01-08', '2008-24-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (5, 'Picture5','Fun/img-69fe6.jpg' ,'Canon ES3', 'Nick', 1280, 102, 1024, 'Description', '1985-01-08', '2008-25-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (6, 'Picture6', 'Fun/img-334ee.jpg','Canon ES3', 'aaa', 1024, 90.9, 768, 'Description', '1985-01-08', '2008-21-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (7, 'Picture7','Fun/img-828dd.jpg' ,'Canon ES3', 'qwazar', 1280, 276, 1024, 'Description', '1985-01-08', '2008-27-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (8, 'Picture8','Fun/img-6537e.jpg' ,'Canon ES3', '', 1600, 338, 1200, 'Description', '1985-01-08', '2008-21-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (9, 'Picture9','Fun/img-7141c.jpg' ,'Canon FS', 'Pit', 1024, 159, 768, 'Description', '1985-01-08', '2008-22-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (10, 'Picture10','Fun/img-25386.jpg' ,'Canon ES3', 'Nick', 1600, 217, 1200, 'Description', '1985-01-08', '2008-21-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (11, 'Picture11','Fun/img-99215.jpg' ,'Canon ES3', 'Andrey', 1024, 74, 768, 'Description', '1985-01-08', '2008-24-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (12, 'Picture12', 'Fun/img-a9307.jpg','Canon ES3', 'aaa', 1680, 197, 1050, 'Description', '1985-01-08', '2008-21-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (13, 'Picture13','Fun/img-b8d37.jpg' ,'Canon ES3-2', 'x-files', 1280, 275, 1024, 'Description', '1985-01-08', '2008-11-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (14, 'Picture14','Fun/img-be1c0.jpg' ,'Canon ES3', 'Nk', 1024, 90.4, 768, 'Description', '1985-01-08', '2008-12-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (15, 'Picture15','Fun/img-cf3ee.jpg' ,'Canon ES3', 'Nickolas', 1024, 97.6, 768, 'Description', '1985-01-08', '2008-22-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (16, 'Picture16','Fun/img-d5ada.jpg' ,'Canon ES3', 'Andr', 1024, 192, 768, 'Description', '1985-01-08', '2008-22-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (17, 'Picture17','Fun/img-d5ed3.jpg' ,'Canon ES3', 'adc', 1024, 213, 768, 'Description', '1985-01-08', '2008-23-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (18, 'Picture18','Fun/img-d966e.jpg' ,'Canon ES3', 'Neeek', 1600, 128, 1200, 'Description', '1985-01-08', '2008-24-11', 1 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (19, 'Picture19','Sport/1.jpg' ,'Canon ES3', 'Potk', 1600, 736, 1200, 'Description', '1985-01-08', '2008-25-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (20, 'Picture20','Sport/2.jpg' ,'Canon ES3', 'aqw', 1280, 229, 1024, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (21, 'Picture100','Sport/3.jpg' ,'Canon ES3', 'ass', 1600, 310, 1200, 'Description', '1985-01-08', '2008-27-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (22, 'Picture101','Sport/4.jpg' ,'Canon ES3', 'www', 1600, 728, 1200, 'Description', '1985-01-08', '2008-29-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (23, 'Picture111','Sport/5.jpg' ,'Canon ES3', 'Nwww', 1280, 251, 1024, 'Description', '1985-01-08', '2008-30-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (24, 'Picture1111','Sport/6.jpg' ,'Canon ES3', 'www', 1280, 278, 1024, 'Description', '1985-01-08', '2008-11-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (25, 'Picture113','Sport/7.jpg' ,'Canon ES3-2', 'Nick', 1600, 689, 1200, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (26, 'Picture1s','Sport/8.jpg' ,'Canon ES3', 'Nick', 1280, 285, 1024, 'Description', '1985-01-08', '2008-14-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (27, 'Picture1sd','Sport/9.jpg' ,'Canon ES3', 'Nick', 1600, 468, 1200, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (28, 'Picture1ssd','Sport/10.jpg' ,'Canon ES3', 'Nick', 1600, 313, 1200, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (29, 'Picture1xd','Sport/11.jpg' ,'Canon ES3', 'Nick', 1600, 214, 1200, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (30, 'Picture1dfd','Sport/12.jpg' ,'Canon ES3', 'Nick', 1280, 336, 1024, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (31, 'Picture1ww','Sport/13.jpg' ,'Canon ES3', 'Nick', 1600, 287, 1200, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (32, 'Picture1weqw','Sport/14.jpg' ,'Canon ES3', 'Nick', 1600, 400,1200, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (33, 'Picture1wdfeqw','Sport/15.jpg' ,'Canon ES3', 'Nick', 1280, 194, 1024, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (34, 'Picture1wseqw','Sport/16.jpg' ,'Canon ES3', 'Nick', 1600, 197, 1200, 'Description', '1985-01-08', '2008-21-11', 2 );
+INSERT INTO galleryImages(GALLERY_IMAGE_ID, name, path, cameraModel, author, height, size, width, description, created, uploaded, IMG_GALLERY_ID) VALUES (35, 'Picture1wddeqw','Sport/17.jpg' ,'Canon ES3', 'Nick', 1280, 87.9, 1024, 'Description', '1985-01-08', '2008-21-11', 2 );
\ No newline at end of file
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileManager.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -20,11 +20,20 @@
*/
package org.richfaces.realworld.fileupload;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
import javax.faces.context.FacesContext;
+import javax.imageio.ImageIO;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Name;
@@ -95,10 +104,68 @@
public void addImage(String fileName, byte[] data) throws IOException {
createDirectoryIfNotExist(fileName);
- FileOutputStream b = new FileOutputStream(getUploadRoot() + fileName);
- b.write(data);
- b.close();
+ writeFileTodisk(data, fileName, 0, 0, "" );
+ writeFileTodisk(data, fileName, 50, 50, "_mini" );
+ writeFileTodisk(data, fileName, 600, 400, "_medium" );
+ //FileOutputStream b = new FileOutputStream(getUploadRoot() + fileName);
+ //b.write(data);
+ //b.close();
+ /*InputStream inputStream = new ByteArrayInputStream(data);
+ BufferedImage bsrc = ImageIO.read(inputStream);
+ inputStream = new ByteArrayInputStream(data);
+ bsrc = ImageIO.read(inputStream);
+ ImageIO.write(bsrc, "JPG", new File(getUploadRoot() + fileName));
+ int width = 50;
+ int height = 50;
+ BufferedImage bdest = new BufferedImage(width, height,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics2D g = bdest.createGraphics();
+ AffineTransform at = AffineTransform.getScaleInstance((double) width
+ / bsrc.getWidth(), (double) height / bsrc.getHeight());
+ g.drawRenderedImage(bsrc, at);
+ String dest = getUploadRoot() + transformPath(fileName, "_mini");
+ ImageIO.write(bdest, "JPG", new File(dest));
+ width = 600;
+ height = 400;
+ bdest = new BufferedImage(width, height,
+ BufferedImage.TYPE_INT_RGB);
+ g = bdest.createGraphics();
+ at = AffineTransform.getScaleInstance((double) width
+ / bsrc.getWidth(), (double) height / bsrc.getHeight());
+ g.drawRenderedImage(bsrc, at);
+ dest = getUploadRoot() + transformPath(fileName, "_medium");
+ ImageIO.write(bdest, "JPG", new File(dest));
+ inputStream.close();*/
}
+
+ private void writeFileTodisk(byte[] data, String fileName, int width, int height, String format) throws IOException{
+ InputStream inputStream = new ByteArrayInputStream(data);
+ BufferedImage bsrc = ImageIO.read(inputStream);
+ if(width == 0){
+ String dest = getUploadRoot() + fileName;
+ ImageIO.write(bsrc, "JPG", new File(dest));
+ return;
+ }
+ BufferedImage bdest = new BufferedImage(width, height,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics2D g = bdest.createGraphics();
+ AffineTransform at = AffineTransform.getScaleInstance((double) width
+ / bsrc.getWidth(), (double) height / bsrc.getHeight());
+ Map<RenderingHints.Key, Object> hints = new HashMap<RenderingHints.Key, Object>();
+ hints.put(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ g.addRenderingHints(hints);
+ g.drawRenderedImage(bsrc, at);
+
+ String dest = getUploadRoot() + transformPath(fileName, format);
+ ImageIO.write(bsrc, "JPG", new File(dest));
+ inputStream.close();
+ }
+
+ public String transformPath(String target, String substitute){
+ String begin = target.substring(0, target.lastIndexOf("."));
+ String end = target.substring(target.lastIndexOf("."));
+ return begin + substitute + end;
+ }
public void deleteAllFromDirectory(String directory){
String fullPath = getAbsolutePath(directory);
@@ -119,6 +186,14 @@
if(file.exists()){
file.delete();
}
+ file = new File(transformPath(fullPath, "_mini"));
+ if(file.exists()){
+ file.delete();
+ }
+ file = new File(transformPath(fullPath, "_medium"));
+ if(file.exists()){
+ file.delete();
+ }
}
public void renameImage(String fileNameOld, String fileNameNew) {
@@ -130,6 +205,18 @@
fileNew.delete();
}
fileOld.renameTo(fileNew);
+ fileOld = new File(transformPath(fullPath, "_mini"));
+ fileNew = new File(getAbsolutePath(transformPath(fileNameNew, "_mini")));
+ if(fileNew.exists()){
+ fileNew.delete();
+ }
+ fileOld.renameTo(fileNew);
+ fileOld = new File(transformPath(fullPath, "_medium"));
+ fileNew = new File(getAbsolutePath(transformPath(fileNameNew, "_medium")));
+ if(fileNew.exists()){
+ fileNew.delete();
+ }
+ fileOld.renameTo(fileNew);
}
private void createDirectoryIfNotExist(String fileNameNew) {
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/FileUploadBean.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -21,7 +21,9 @@
package org.richfaces.realworld.fileupload;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
@@ -39,6 +41,14 @@
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.util.SelectionHelper;
+import com.drew.imaging.jpeg.JpegMetadataReader;
+import com.drew.imaging.jpeg.JpegProcessingException;
+import com.drew.metadata.Directory;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
+import com.drew.metadata.exif.ExifDirectory;
+import com.drew.metadata.jpeg.JpegDirectory;
+
/**
* @author $Autor$
*
@@ -75,13 +85,49 @@
file.setData(item.getData());
file.setSelected(false);
Image image = new Image();
- image.setCreated(new Date());
+ image.setUploaded(new Date());
image.setDescription(SAMPLE_DESCRIPTION);
image.setName(SAMPLE_NAME);
+ image.setSize(file.getLength());
image.setPath(user.getLogin() + "/" + selectionHelper.getSelectedAlbum().getName() + "/" + item.getFileName());
image.setAlbumName(selectionHelper.getSelectedAlbum().getName());
image.setAlbum(selectionHelper.getSelectedAlbum());
- file.setImage(image);
+ try {
+ InputStream in = new ByteArrayInputStream(file.getData());
+ Metadata metadata = JpegMetadataReader.readMetadata(in);
+ Directory exifDirectory = metadata.getDirectory(ExifDirectory.class);
+ Directory jpgDirectory = metadata.getDirectory(JpegDirectory.class);
+
+ if(exifDirectory.containsTag(ExifDirectory.TAG_MODEL)){
+ String cameraModel = exifDirectory.getString(ExifDirectory.TAG_MODEL);
+ image.setCameraModel(cameraModel);
+ }
+ if(exifDirectory.containsTag(ExifDirectory.TAG_EXIF_IMAGE_WIDTH) && exifDirectory.containsTag(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT)){
+ int width = exifDirectory.getInt(ExifDirectory.TAG_EXIF_IMAGE_WIDTH);
+ image.setWidth(width);
+ int height = exifDirectory.getInt(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT);
+ image.setHeight(height);
+ }else{
+ if(jpgDirectory.containsTag(JpegDirectory.TAG_JPEG_IMAGE_HEIGHT)){
+ int width = jpgDirectory.getInt(JpegDirectory.TAG_JPEG_IMAGE_WIDTH);
+ image.setWidth(width);
+ int height = jpgDirectory.getInt(JpegDirectory.TAG_JPEG_IMAGE_HEIGHT);
+ image.setHeight(height);
+ }
+ }
+ if(exifDirectory.containsTag(ExifDirectory.TAG_DATETIME_ORIGINAL)){
+ Date time = exifDirectory.getDate(ExifDirectory.TAG_DATETIME_ORIGINAL);
+ image.setCreated(time);
+ }
+ }
+ catch (JpegProcessingException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (MetadataException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ file.setImage(image);
fileWrapper.getFiles().add(file);
}
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/fileupload/ImageLoader.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -53,9 +53,7 @@
FileManager fileManager;
public synchronized void paintSearchImage(OutputStream stream, Object object) throws IOException {
- Image painted = (Image)object;
-
- File image = fileManager.getImage(fileManager.transformToServerPath(painted.getPath()));
+ File image = fileManager.getImage(fileManager.transformToServerPath(object.toString()));
InputStream paintData = null;
byte[] data = new byte[(int)image.length() - 1];
FileInputStream fileInputStream = null;
@@ -101,8 +99,7 @@
if (null == data) {
return;
}
- Image image = (Image)data;
- File imageResource = fileManager.getImage(fileManager.transformToServerPath(image.getPath()));;
+ File imageResource = fileManager.getImage(fileManager.transformToServerPath(data.toString()));;
if (imageResource != null) {
FileInputStream fileInputStream = new FileInputStream(imageResource);
BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
@@ -124,6 +121,33 @@
}
}
+ public synchronized void paintGalleryImage(OutputStream out, Object data) throws IOException{
+ if (null == data) {
+ return;
+ }
+ String fileName = fileManager.getFileSeparator() + "galleries" + fileManager.getFileSeparator() + fileManager.transformToServerPath(data.toString());
+ File imageResource = fileManager.getImage(fileName);
+ if (imageResource != null) {
+ FileInputStream fileInputStream = new FileInputStream(imageResource);
+ BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
+ InputStream paintData = bufferedInputStream;
+ if (null == paintData) {
+ // throw new Exception("");
+ // TODO
+ }
+ try{
+ BufferedImage images = ImageIO.read(paintData);
+ ImageIO.write(images, JPEG, out);
+ }catch(Exception e){
+
+ }finally{
+ fileInputStream.close();
+ bufferedInputStream.close();
+ paintData.close();
+ }
+ }
+ }
+
public synchronized void paintAvatar(OutputStream out, Object data) throws IOException{
if (null == data) {
return;
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,214 @@
+package org.richfaces.realworld.gallery;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.Iterator;
+
+import javax.imageio.ImageIO;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.richfaces.event.UploadEvent;
+import org.richfaces.model.UploadItem;
+import org.richfaces.realworld.domain.Gallery;
+import org.richfaces.realworld.domain.GalleryImage;
+import org.richfaces.realworld.fileupload.FileItem;
+import org.richfaces.realworld.fileupload.FileManager;
+import org.richfaces.realworld.service.IGalleryAction;
+
+import com.drew.imaging.jpeg.JpegMetadataReader;
+import com.drew.imaging.jpeg.JpegProcessingException;
+import com.drew.metadata.Directory;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
+import com.drew.metadata.Tag;
+import com.drew.metadata.exif.ExifDirectory;
+import com.drew.metadata.jpeg.JpegDirectory;
+ at Name("galleryBean")
+ at Scope(ScopeType.CONVERSATION)
+public class GalleryBean {
+
+ public GalleryBean(){
+ selectedGallery = null;
+ }
+ @In(create=true) IGalleryAction galleryAction;
+ @In(create=true) FileManager fileManager;
+ private Gallery selectedGallery;
+
+ private boolean uploadPanelRendered;
+ private boolean galleryPanelRendered;
+ private String author;
+ private String desc;
+ private String name;
+ private String path;
+ private String galleryName;
+
+ private FileItem file;
+
+ public void showUploadPanel(){
+ setUploadPanelRendered(true);
+ author = "";
+ name = "";
+ desc = "";
+ path ="";
+ file = null;
+ }
+
+ public void hideUploadPanel(){
+ setUploadPanelRendered(false);
+ GalleryImage image = new GalleryImage();
+ image.setAuthor(author);
+ image.setDescription(desc);
+ image.setName(name);
+ image.setUploaded(new Date());
+ image.setPath(path);
+ image.setSize(file.getLength());
+ try {
+ InputStream in = new ByteArrayInputStream(file.getData());
+ Metadata metadata = JpegMetadataReader.readMetadata(in);
+ Directory exifDirectory = metadata.getDirectory(ExifDirectory.class);
+ Directory jpgDirectory = metadata.getDirectory(JpegDirectory.class);
+
+ if(exifDirectory.containsTag(ExifDirectory.TAG_MODEL)){
+ String cameraModel = exifDirectory.getString(ExifDirectory.TAG_MODEL);
+ image.setCameraModel(cameraModel);
+ }
+ if(exifDirectory.containsTag(ExifDirectory.TAG_EXIF_IMAGE_WIDTH) && exifDirectory.containsTag(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT)){
+ int width = exifDirectory.getInt(ExifDirectory.TAG_EXIF_IMAGE_WIDTH);
+ image.setWidth(width);
+ int height = exifDirectory.getInt(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT);
+ image.setHeight(height);
+ }else{
+ if(jpgDirectory.containsTag(JpegDirectory.TAG_JPEG_IMAGE_HEIGHT)){
+ int width = jpgDirectory.getInt(JpegDirectory.TAG_JPEG_IMAGE_WIDTH);
+ image.setWidth(width);
+ int height = jpgDirectory.getInt(JpegDirectory.TAG_JPEG_IMAGE_HEIGHT);
+ image.setHeight(height);
+ }
+ }
+ if(exifDirectory.containsTag(ExifDirectory.TAG_DATETIME_ORIGINAL)){
+ Date time = exifDirectory.getDate(ExifDirectory.TAG_DATETIME_ORIGINAL);
+ image.setCreated(time);
+ }
+ }
+ catch (JpegProcessingException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (MetadataException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ galleryAction.addImage(selectedGallery, image);
+ try {
+ fileManager.addImage("galleries" + fileManager.getFileSeparator() + path, file.getData());
+ file = null;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ public void showGalleryPanel(){
+ setGalleryPanelRendered(true);
+ galleryName = "";
+ }
+
+ public void selectGallery(Gallery gal){
+ setSelectedGallery(gal);
+ }
+
+ public void goToGalleryHome(){
+ setSelectedGallery(null);
+ }
+
+ public synchronized void listener(UploadEvent event) throws Exception{
+ UploadItem item = event.getUploadItem();
+ file = new FileItem();
+ file.setLength(item.getData().length);
+ file.setData(item.getData());
+ path = getSelectedGallery().getName() + fileManager.getFileSeparator()+item.getFileName();
+ }
+
+ public void hideGalleryPanel(){
+ setGalleryPanelRendered(false);
+ galleryAction.addGallery(galleryName);
+ fileManager.addDirectory(fileManager.getUploadRoot() + fileManager.getFileSeparator() + "galleries" + fileManager.getFileSeparator()+ galleryName);
+ }
+
+ public Gallery getSelectedGallery() {
+ return selectedGallery;
+ }
+
+ public void setSelectedGallery(Gallery selectedGallery) {
+ this.selectedGallery = selectedGallery;
+ }
+
+ public boolean isUploadPanelRendered() {
+ return uploadPanelRendered;
+ }
+
+ public void setUploadPanelRendered(boolean uploadPanelRendered) {
+ this.uploadPanelRendered = uploadPanelRendered;
+ }
+
+ public boolean isGalleryPanelRendered() {
+ return galleryPanelRendered;
+ }
+
+ public void setGalleryPanelRendered(boolean galleryPanelRendered) {
+ this.galleryPanelRendered = galleryPanelRendered;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getGalleryName() {
+ return galleryName;
+ }
+
+ public void setGalleryName(String galleryName) {
+ this.galleryName = galleryName;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public FileItem getFile() {
+ return file;
+ }
+
+ public void setFile(FileItem file) {
+ this.file = file;
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/gallery/GalleryBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -23,5 +23,5 @@
public enum NavigationEnum {
IMAGE_PREVIEW,
FILE_UPLOAD,
- USER_PREFS, SEARCH, READ_MESSAGES,
+ USER_PREFS, SEARCH, READ_MESSAGES, GALLERY,
}
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationHelper.java 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/NavigationHelper.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -38,6 +38,10 @@
return NavigationEnum.USER_PREFS;
}
+ public NavigationEnum getNavigationEnumGallery(){
+ return NavigationEnum.GALLERY;
+ }
+
public NavigationEnum getNavigationEnumSearch(){
return NavigationEnum.SEARCH;
}
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/FileHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/FileHelper.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/FileHelper.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,63 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces.realworld.servlet;
+
+import java.io.File;
+
+public class FileHelper {
+
+ private static final String FILE_SEPARATOR = "file.separator";
+ private String uploadRoot;
+
+ public String getUploadRoot() {
+ return uploadRoot;
+ }
+
+ public void setUploadRoot(String uploadRoot) {
+ this.uploadRoot = uploadRoot;
+ }
+
+ public FileHelper(String uploadRoot){
+ this.setUploadRoot(uploadRoot);
+ }
+
+ public String getFileSeparator() {
+ return System.getProperty(FILE_SEPARATOR);
+ }
+
+ public boolean isImagePresent(String fileName) {
+ String fullPath = getAbsolutePath(fileName);
+ File file = new File(fullPath);
+ return file.exists() && !file.isDirectory();
+ }
+
+ public File getImage(String fileName){
+ if(isImagePresent(fileName)){
+ return new File(getAbsolutePath(fileName));
+ }
+ return null;
+ }
+
+ private String getAbsolutePath(String fileName) {
+ return getUploadRoot() + fileName;
+ }
+
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/FileHelper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,110 @@
+package org.richfaces.realworld.servlet;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.drew.imaging.jpeg.JpegMetadataReader;
+import com.drew.imaging.jpeg.JpegProcessingException;
+import com.drew.metadata.Directory;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
+import com.drew.metadata.exif.ExifDirectory;
+
+public class PictureServlet extends javax.servlet.http.HttpServlet {
+
+ public static final long serialVersionUID = 596009789004L;
+ private static final String UPLOAD_ROOT = "uploadRoot";
+
+ protected void doGet(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
+ String pathInfo = request.getPathInfo();
+ String fileName = WebUtil.getFileName(pathInfo);
+ if (fileName == null) {
+ String contextPath = request.getContextPath();
+ response.sendRedirect(contextPath + "/error.seam");
+ return;
+ }
+ ServletContext context = getServletContext();
+ FileHelper helper = new FileHelper(context.getInitParameter(UPLOAD_ROOT));
+ File file = helper.getImage(fileName);
+ /*try {
+ Metadata metadata = JpegMetadataReader.readMetadata(file);
+ Directory exifDirectory = metadata.getDirectory(ExifDirectory.class);
+ if(exifDirectory.containsTag(ExifDirectory.TAG_MODEL)){
+ String cameraModel = exifDirectory.getString(ExifDirectory.TAG_MODEL);
+ System.out.println(cameraModel);
+ }
+ if(exifDirectory.containsTag(ExifDirectory.TAG_EXIF_IMAGE_WIDTH)){
+ int width = exifDirectory.getInt(ExifDirectory.TAG_EXIF_IMAGE_WIDTH);
+ System.out.println(width);
+ }
+ if(exifDirectory.containsTag(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT)){
+ int height = exifDirectory.getInt(ExifDirectory.TAG_EXIF_IMAGE_HEIGHT);
+ System.out.println(height);
+ }
+ if(exifDirectory.containsTag(ExifDirectory.TAG_DATETIME_ORIGINAL)){
+ Date time = exifDirectory.getDate(ExifDirectory.TAG_DATETIME_ORIGINAL);
+ System.out.println(time);
+ }
+ }
+ catch (JpegProcessingException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (MetadataException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }*/
+ InputStream paintData = null;
+ byte[] data = new byte[(int) file.length() - 1];
+ FileInputStream fileInputStream = null;
+ BufferedInputStream bufferedInputStream = null;
+ if (file != null) {
+ try {
+ fileInputStream = new FileInputStream(file);
+ bufferedInputStream = new BufferedInputStream(fileInputStream);
+ paintData = bufferedInputStream;
+ paintData.read(data);
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } finally {
+ try {
+ fileInputStream.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ try {
+ bufferedInputStream.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ try {
+ paintData.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+ response.setContentType("image/jpg");
+ response.setContentLength((int) data.length - 1);
+ response.getOutputStream().write(data);
+ response.getOutputStream().flush();
+ response.getOutputStream().close();
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/WebUtil.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/WebUtil.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/WebUtil.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,33 @@
+package org.richfaces.realworld.servlet;
+
+public class WebUtil {
+
+ public static String getFileName(String path) {
+ // Path format is "/file_name.jpg"
+ if (path != null && path.length() > 1) {
+ String fileName = path.substring(1);
+ int dotIndex = fileName.indexOf('.');
+ String extention = fileName.substring(dotIndex + 1);
+ if (extention.equals(Extention.jpg.getExtention())
+ || extention.equals(Extention.jpeg.getExtention()))
+ {
+ return fileName;
+ }
+ }
+ return null;
+ }
+
+ enum Extention {
+ jpg("jpg"), jpeg("jpeg");
+
+ Extention(String extention) {
+ this.extention = extention;
+ }
+
+ private String extention;
+
+ String getExtention() {
+ return this.extention;
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/servlet/WebUtil.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/LinkBuilder.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/LinkBuilder.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/LinkBuilder.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,116 @@
+package org.richfaces.realworld.util;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.context.FacesContext;
+import javax.faces.model.SelectItem;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+ at Name("linkBuilder")
+ at Scope(ScopeType.CONVERSATION)
+public class LinkBuilder implements Serializable{
+
+ private static final long serialVersionUID = 2561824019376412988L;
+ private static final String MINI_FORMAT = "_mini";
+ private static final String MEDIUM_FORMAT = "_medium";
+ @In("#{messages['small']}") private String SMALL;
+ @In("#{messages['medium']}") private String MEDIUM;
+ @In("#{messages['full']}") private String FULL;
+ private Long scaleChoice = 1L;
+ private String generatedLink;
+ private String currentFormat = URL;
+ private String path;
+ private static String URL = "URL";
+ private static String HTML = "HTML";
+ private static String FORUM = "Forum";
+ private static String HTML_PATTERN = "<a href='%s'><img src='%s' border='0'></a>";
+ private static String FORUM_PATTERN = "[URL=%s][IMG]%s[/IMG][/URL]";
+
+ public String getGeneratedLink() {
+
+ ServletRequest servletRequest = ((ServletRequest)(FacesContext.getCurrentInstance().getExternalContext().getRequest()));
+ ServletContext s = (ServletContext)(FacesContext.getCurrentInstance().getExternalContext().getContext());
+ String protocol = servletRequest.getProtocol().equals("HTTP/1.1") || servletRequest.getProtocol().equals("HTTP/1.0") ? "http://" : "https://" ;
+ String servletPath = protocol + servletRequest.getLocalAddr() + ":" + servletRequest.getLocalPort() + s.getContextPath();
+ String link = null;
+ String tempPath = null;
+ if(getScaleChoice() == 3L){
+ tempPath = MINI_FORMAT;
+ }else if(getScaleChoice() == 2L){
+ tempPath = MEDIUM_FORMAT;
+ }else if(getScaleChoice() == 1L){
+ tempPath="";
+ }
+ if(null == path){
+ return "";
+ }
+ if(getCurrentFormat().equals(URL)){
+ link = servletPath + "/pictures/" + transformPath(path, tempPath);
+ }else
+ if(getCurrentFormat().equals(HTML)){
+ link = String.format(HTML_PATTERN, servletPath, servletPath+ "/pictures/" + transformPath(path, tempPath));
+ }else
+ if(getCurrentFormat().equals(FORUM)){
+ link = String.format(FORUM_PATTERN, servletPath, servletPath+ "/pictures/" + transformPath(path, tempPath));
+ }
+ return link;
+ }
+
+ private String transformPath(String target, String substitute){
+ String begin = target.substring(0, target.lastIndexOf("."));
+ String end = target.substring(target.lastIndexOf("."));
+ return begin + substitute + end;
+ }
+
+ public void setGeneratedLink(String generatedLink) {
+ this.generatedLink = generatedLink;
+ }
+
+ public List<SelectItem> getItems() {
+ List<SelectItem> list = new ArrayList<SelectItem>(4);
+ list.add(new SelectItem(Long.valueOf(1L), FULL));
+ list.add(new SelectItem(Long.valueOf(2L), MEDIUM));
+ list.add(new SelectItem(Long.valueOf(3L), SMALL));
+ return list;
+ }
+
+ public Long getScaleChoice() {
+ return scaleChoice;
+ }
+
+ public void setScaleChoice(Long scaleChoice) {
+ this.scaleChoice = scaleChoice;
+ }
+
+ public void selectFormat(String format){
+ setCurrentFormat(format);
+ }
+
+ public String getCurrentFormat() {
+ return currentFormat;
+ }
+
+ public void setCurrentFormat(String currentFormat) {
+ this.currentFormat = currentFormat;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public void setScale(Long choice){
+ setScaleChoice(choice);
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/LinkBuilder.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/test.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/test.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/test.java 2009-01-05 16:44:21 UTC (rev 12108)
@@ -0,0 +1,70 @@
+package org.richfaces.realworld.util;
+
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.imageio.ImageIO;
+
+public class test {
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) {
+ String directory ="C:\\Documents and Settings\\Administrator\\Desktop\\Fun";
+ writeFiles(directory, "_mini", 100, 100);
+ }
+
+ private static void writeFiles(String directory, String pattern, int width, int height) {
+ File f = new File(directory);
+ for(String s: f.list()){
+ File temp = new File(directory +"\\"+ s);
+ if(temp.isDirectory() && !(directory +"\\"+ s).endsWith("avatars")){
+ writeFiles(directory +"\\"+ s,pattern, width, height);
+ }
+ if(s.endsWith(".jpg") && !s.endsWith("_mini.jpg")&& !s.endsWith("_medium.jpg")){
+ BufferedImage bsrc =null;
+ try {
+ bsrc = ImageIO.read(temp);
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ BufferedImage bdest = new BufferedImage(width, height,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics2D g = bdest.createGraphics();
+ int width2 = bsrc.getWidth();
+ int height2 = bsrc.getHeight();
+ double d = (double) width
+ / width2;
+ double e = (double) height / height2;
+ AffineTransform at = AffineTransform.getScaleInstance(d, e);
+ Map<RenderingHints.Key, Object> hints = new HashMap<RenderingHints.Key, Object>();
+ hints.put(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ g.addRenderingHints(hints);
+ g.drawRenderedImage(bsrc, at);
+ String dest = transformPath(directory +"\\"+ s, pattern);
+ try {
+ ImageIO.write(bdest, "JPG", new File(dest));
+ } catch (IOException ex) {
+ // TODO Auto-generated catch block
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ private static String transformPath(String target, String substitute){
+ String begin = target.substring(0, target.lastIndexOf("."));
+ String end = target.substring(target.lastIndexOf("."));
+ return begin + substitute + end;
+ }
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/realworld/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/test-applications/realworld/web/src/main/resources/messages_en.properties 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/web/src/main/resources/messages_en.properties 2009-01-05 16:44:21 UTC (rev 12108)
@@ -120,20 +120,19 @@
message.authorHeader=Author
message.themeHeader=Theme
message.dateHeader=Date
-message.theme=Theme: #{record.theme}
-message.author=Author:
+message.theme=Theme\:
+message.author=Author\:
message.date=Date: #{record.date}
message.delete=Delete
message.read=Read
message.re=Re:
message.message=Message
-message.owner=Owner:
-message.content=Content:
+message.owner=Owner\:
+message.content=Content\:
message.addFriend=Add to friends
message.friendRequest=It is request for friendship message. You may add this user to your friends by clicking on the 'Add to Friends button'
message.send=Send
message.close=Close
-message.theme=Theme:
confirm.confirm=Confirmation:
confirm.ok=OK
@@ -253,4 +252,7 @@
equals=Equals
more=More
less=Less
-nomatter=No Matter
\ No newline at end of file
+nomatter=No Matter
+small=Small
+medium=Medium
+full=Full size
\ No newline at end of file
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml 2009-01-05 16:21:28 UTC (rev 12107)
+++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml 2009-01-05 16:44:21 UTC (rev 12108)
@@ -8,8 +8,10 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:transaction="http://jboss.com/products/seam/transaction"
+ xmlns:web="http://jboss.com/products/seam/web"
xsi:schemaLocation=
"http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.0.xsd
+ http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.1.0.xsd
http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.0.xsd
http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.0.xsd
http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.0.xsd
@@ -18,8 +20,8 @@
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.0.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.0.xsd">
- <core:init debug="true" jndi-pattern="@jndiPattern@"/>
-
+ <core:init transaction-management-enabled="false" debug="true" jndi-pattern="@jndiPattern@"/>
+ <web:context-filter url-pattern="/picture/*" />
<core:manager concurrent-request-timeout="20000"
conversation-timeout="120000"
conversation-id-parameter="cid"
Modified: trunk/test-applications/realworld/web/src/main/webapp/img/Thumbs.db
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/fileUploadPanel.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/fileUploadPanel.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/main.xhtml
===================================================================
(Binary files differ)
More information about the richfaces-svn-commits
mailing list