richfaces-svn-commits
March 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 552 discussions
JBoss Rich Faces SVN: r12825 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/util and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-04 09:59:18 -0500 (Wed, 04 Mar 2009)
New Revision: 12825
Added:
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfImagesPreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java
trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties
trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar-backup.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
Log:
Realworld: apply new design for shell tree, add new navigation for tree, add localization, adjust shelf and album preview pages
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-04 14:58:43 UTC (rev 12824)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-04 14:59:18 UTC (rev 12825)
@@ -26,8 +26,9 @@
USER_PREFS("includes/userPrefs.xhtml"),
SEARCH("includes/search.xhtml"),
WHAT_NEW("includes/recent.xhtml"),
- ALBUM_PREVIEW("includes/userImage.xhtml"),
- SHELF_PREVIEW("/includes/userAlbum.xhtml"),
+ ALBUM_PREVIEW("includes/userAlbum.xhtml"),
+ ALBUM_IMAGE_PREVIEW("/includes/userImage.xhtml"),
+ SHELF_PREVIEW("/includes/userShelf.xhtml"),
ALL_SHELFS("/includes/userShelfs.xhtml"),
TAGS("includes/tag.xhtml"),
ALL_ALBUMS("includes/albums.xhtml"),
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-04 14:58:43 UTC (rev 12824)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-04 14:59:18 UTC (rev 12825)
@@ -223,7 +223,7 @@
Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS));
return;
}
- Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW);
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW);
setSelectedAlbum(album);
setSelectedImage(null);
setSelectedShelf(album.getParent());
@@ -235,7 +235,7 @@
Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS));
return;
}
- Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW);
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
setSelectedAlbum(image.getAlbum());
setSelectedImage(image);
Integer index = getSelectedAlbum().getIndex(getSelectedImage());
@@ -307,15 +307,16 @@
@SuppressWarnings("unchecked")
public void processSelection(NodeSelectedEvent event) {
- Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.IMAGE_PREVIEW);
HtmlTree tree = (HtmlTree) event.getComponent();
TreeNode<Object> currentNode = (TreeNode<Object>)tree.getModelTreeNode(tree.getRowKey());
if(currentNode instanceof TreeAlbumItem){
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW);
TreeAlbumItem node = (TreeAlbumItem)currentNode;
Album album = node.getAlbum();
setSelectedAlbum(album);
setSelectedShelf(album.getParent());
}else if(currentNode instanceof TreeShelfItem){
+ Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW);
TreeShelfItem node = (TreeShelfItem)currentNode;
Shelf shelf = node.getShelf();
setSelectedAlbum(null);
Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-03-04 14:58:43 UTC (rev 12824)
+++ trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-03-04 14:59:18 UTC (rev 12825)
@@ -113,6 +113,7 @@
comment.add=Add comment
comment.save=Save
comment.cancel=Cancel
+comment.comments=Comments
message.sendMessage=Send message
message.sendToUser=Send message for this user
@@ -324,4 +325,14 @@
linkManagement=Link management
close=Close
myAlbumShelfs=My album shelfs
-newPhotos=New photos
\ No newline at end of file
+newPhotos=New photos
+created.shelf=Created
+created.album=Created
+created.image=Captured
+contain=contain
+pics_into=pics into
+new=new
+shelf.albums=albums
+pics=pics
+tags=Tags
+original_size=Original size
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties
===================================================================
--- trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-04 14:58:43 UTC (rev 12824)
+++ trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-04 14:59:18 UTC (rev 12825)
@@ -265,4 +265,15 @@
linkManagement=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043A\u0430\u043C\u0438
close=\u0417\u0430\u043A\u0440\u044B\u0442\u044C
myAlbumShelfs=\u041C\u043E\u0438 \u043A\u043E\u043B\u043B\u0435\u043A\u0446\u0438\u0438 \u0430\u043B\u044C\u0431\u043E\u043C\u043E\u0432
-newPhotos=\u041D\u043E\u0432\u044B\u0435 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438
\ No newline at end of file
+newPhotos=\u041D\u043E\u0432\u044B\u0435 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438
+created.shelf=\u0421\u043E\u0437\u0434\u0430\u043D\u0430
+created.album=\u0421\u043E\u0437\u0434\u0430\u043D
+created.image=\u0421\u0434\u0435\u043B\u0430\u043D\u043E
+contain=\u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442
+pics_into=\u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439 \u0432
+new=\u043D\u043E\u0432\u044B\u0445
+shelf.albums=\u0430\u043B\u044C\u0431\u043E\u043C\u0435(\u0430\u0445)
+pics=\u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439
+tags=\u0422\u044D\u0433\u0438
+comment.comments=\u041A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438
+original_size=\u041E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u044C\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/panelBar/tree.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfImagesPreview.xhtml
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml (from rev 12818, trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelf.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/panelBar-backup.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-04 14:58:43 UTC (rev 12824)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-04 14:59:18 UTC (rev 12825)
@@ -446,3 +446,7 @@
.dr-tree-h-text {
white-space: normal;
}
+
+.tree-selected-node{
+ font-weight: bold;
+}
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12824 - in trunk/test-applications/realworld2/ejb/src/main: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-04 09:58:43 -0500 (Wed, 04 Mar 2009)
New Revision: 12824
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
Log:
Realworld: apply new design for shell tree, add new navigation for tree, add localization, adjust shelf and album preview pages
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-03-04 13:27:27 UTC (rev 12823)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-03-04 14:58:43 UTC (rev 12824)
@@ -2,6 +2,7 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType;
@@ -16,6 +17,8 @@
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
import org.hibernate.validator.Length;
import org.hibernate.validator.NotEmpty;
@@ -53,6 +56,9 @@
@org.hibernate.annotations.OrderBy(clause = "NAME asc")
private List<Album> childAlbums = new ArrayList<Album>();
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date created;
+
/**
* Getter for property id
*
@@ -143,4 +149,18 @@
return result;
}
+
+ /**
+ * @return the created
+ */
+ public Date getCreated() {
+ return created;
+ }
+
+ /**
+ * @param created the created to set
+ */
+ public void setCreated(Date created) {
+ this.created = created;
+ }
}
Modified: trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-04 13:27:27 UTC (rev 12823)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-04 14:58:43 UTC (rev 12824)
@@ -2,10 +2,10 @@
INSERT INTO Users(user_id, firstname, secondname, email, login, passwordHash, birthdate, sex, doNotShowMail, informAboutNews) VALUES (2, 'Nick', 'Curtis', 'nkurtis(a)iba.com', 'Viking', '8cb2237d0679ca88db6464eac60da96345513964', '1978-01-08', 1, 1, 1);
INSERT INTO Users(user_id, firstname, secondname, email, login, passwordHash, birthdate, sex, doNotShowMail, informAboutNews) VALUES (3, 'John', 'Smith', 'jsmith(a)jboss.com', 'Noname', '8cb2237d0679ca88db6464eac60da96345513964', '1970-01-08', 1, 1, 1);
-INSERT INTO shelfs(shelf_id, name, description, shelf_user_id) VALUES (1, 'Nature', 'Nature pictures', 1);
-INSERT INTO shelfs(shelf_id, name, description, shelf_user_id) VALUES (2, 'Sport', 'Nature pictures', 1);
-INSERT INTO shelfs(shelf_id, name, description, shelf_user_id) VALUES (3, 'Water', 'Nature pictures', 2);
-INSERT INTO shelfs(shelf_id, name, description, shelf_user_id) VALUES (4, 'Flowers', 'Nature pictures', 3);
+INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created) VALUES (1, 'Nature', 'Nature pictures', 1, '2008-12-18');
+INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created) VALUES (2, 'Sport', 'Nature pictures', 1, '2008-12-18');
+INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created) VALUES (3, 'Water', 'Nature pictures', 2, '2008-12-18');
+INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created) VALUES (4, 'Flowers', 'Nature pictures', 3, '2008-12-18');
INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (15, 'Water', 'Rivers pictures', true, 2, 3, '2008-12-18');
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12823 - trunk/test-applications/realworld2/ejb/src/main/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-04 08:27:27 -0500 (Wed, 04 Mar 2009)
New Revision: 12823
Modified:
trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
Log:
Modified: trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-04 13:20:50 UTC (rev 12822)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-04 13:27:27 UTC (rev 12823)
@@ -12,134 +12,538 @@
INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (20, 'Sport', 'Nature pictures', true, 1, 1, '2008-12-18');
-INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (26, 'Travel', 'Fun pictures', true, 1, 2, '2008-12-18');
+INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (26, 'Flowers', 'Fun pictures', true, 1, 2, '2008-12-18');
INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (25, 'Beach', 'Fun pictures', true, 1, 1, '2008-12-18');
-INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (23, 'Flowers', 'Fun pictures', true, 3, 4, '2008-12-18');
+INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (23, 'Travel', 'Fun pictures', true, 3, 4, '2008-12-18');
INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (27, 'Very very very very very very very long album name ', 'Long name test', true, 1, 2, '2008-12-18');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (98, 'korana', 'Viking/15/korana.jpg', 'korana', '2008-12-18', 15, 'Canon S3', 1024, 1917.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (99, 'korana2', 'Viking/15/korana2.jpg', 'korana2', '2008-12-18', 15, 'Canon S3', 1024, 949.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (100, 'Re4ka', 'Viking/15/Re4ka.jpg', 'Re4ka', '2008-12-18', 15, 'Canon S3', 1024, 412.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (101, 'river10', 'Viking/15/river10.jpg', 'river10', '2008-12-18', 15, 'Canon S3', 1024, 276.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (102, 'river11', 'Viking/15/river11.jpg', 'river11', '2008-12-18', 15, 'Canon S3', 1024, 187.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (103, 'river12', 'Viking/15/river12.jpg', 'river12', '2008-12-18', 15, 'Canon S3', 1024, 265.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (104, 'river13', 'Viking/15/river13.jpg', 'river13', '2008-12-18', 15, 'Canon S3', 1024, 106.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (105, 'river2', 'Viking/15/river2.jpg', 'river2', '2008-12-18', 15, 'Canon S3', 1024, 130.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (106, 'river3', 'Viking/15/river3.jpg', 'river3', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (107, 'river4', 'Viking/15/river4.jpg', 'river4', '2008-12-18', 15, 'Canon S3', 1024, 267.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (108, 'river5', 'Viking/15/river5.jpg', 'river5', '2008-12-18', 15, 'Canon S3', 1024, 176.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (109, 'river6', 'Viking/15/river6.jpg', 'river6', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (110, 'river7', 'Viking/15/river7.jpg', 'river7', '2008-12-18', 15, 'Canon S3', 1024, 201.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (111, 'river8', 'Viking/15/river8.jpg', 'river8', '2008-12-18', 15, 'Canon S3', 1024, 278.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (112, 'river9', 'Viking/15/river9.jpg', 'river9', '2008-12-18', 15, 'Canon S3', 1024, 210.000000, 768, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (113, 'river_and_torrents', 'Viking/15/river_and_torrents.jpg', 'river_and_torrents', '2008-12-18', 15, 'Canon S3', 1024, 161.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (1, 'korana', 'Viking/15/korana.jpg', 'korana', '2008-12-18', 15, 'Canon S3', 1024, 1917.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (2, 'korana2', 'Viking/15/korana2.jpg', 'korana2', '2008-12-18', 15, 'Canon S3', 1024, 949.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (3, 'Re4ka', 'Viking/15/Re4ka.jpg', 'Re4ka', '2008-12-18', 15, 'Canon S3', 1024, 412.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (4, 'river10', 'Viking/15/river10.jpg', 'river10', '2008-12-18', 15, 'Canon S3', 1024, 276.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (5, 'river11', 'Viking/15/river11.jpg', 'river11', '2008-12-18', 15, 'Canon S3', 1024, 187.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (6, 'river12', 'Viking/15/river12.jpg', 'river12', '2008-12-18', 15, 'Canon S3', 1024, 265.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (7, 'river13', 'Viking/15/river13.jpg', 'river13', '2008-12-18', 15, 'Canon S3', 1024, 106.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (8, 'river2', 'Viking/15/river2.jpg', 'river2', '2008-12-18', 15, 'Canon S3', 1024, 130.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (9, 'river3', 'Viking/15/river3.jpg', 'river3', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (10, 'river4', 'Viking/15/river4.jpg', 'river4', '2008-12-18', 15, 'Canon S3', 1024, 267.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (11, 'river5', 'Viking/15/river5.jpg', 'river5', '2008-12-18', 15, 'Canon S3', 1024, 176.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (12, 'river6', 'Viking/15/river6.jpg', 'river6', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (13, 'river7', 'Viking/15/river7.jpg', 'river7', '2008-12-18', 15, 'Canon S3', 1024, 201.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (14, 'river8', 'Viking/15/river8.jpg', 'river8', '2008-12-18', 15, 'Canon S3', 1024, 278.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (15, 'river9', 'Viking/15/river9.jpg', 'river9', '2008-12-18', 15, 'Canon S3', 1024, 210.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (16, 'river_and_torrents', 'Viking/15/river_and_torrents.jpg', 'river_and_torrents', '2008-12-18', 15, 'Canon S3', 1024, 161.000000, 768, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (17, 'Sport1', 'amarkhel/20/sport.jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (18, 'Sport1', 'amarkhel/20/sport (1).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (19, 'Sport1', 'amarkhel/20/sport (2).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (20, 'Sport1', 'amarkhel/20/sport (3).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (21, 'Sport1', 'amarkhel/20/sport (4).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (22, 'Sport1', 'amarkhel/20/sport (5).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (23, 'Sport1', 'amarkhel/20/sport (6).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (24, 'Sport1', 'amarkhel/20/sport (7).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (25, 'Sport1', 'amarkhel/20/sport (8).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (26, 'Sport1', 'amarkhel/20/sport (9).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (27, 'Sport1', 'amarkhel/20/sport (10).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (28, 'Sport1', 'amarkhel/20/sport (11).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (29, 'Sport1', 'amarkhel/20/sport (12).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (30, 'Sport1', 'amarkhel/20/sport (13).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (31, 'Sport1', 'amarkhel/20/sport (14).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (32, 'Sport1', 'amarkhel/20/sport (15).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (33, 'Sport1', 'amarkhel/20/sport (16).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (34, 'Sport1', 'amarkhel/20/sport (17).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (35, 'Fun', 'amarkhel/23/travel.jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (36, 'Fun', 'amarkhel/23/travel (1).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (37, 'Fun', 'amarkhel/23/travel (2).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (38, 'Fun', 'amarkhel/23/travel (3).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (39, 'Fun', 'amarkhel/23/travel (4).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (40, 'Fun', 'amarkhel/23/travel (5).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (41, 'Fun', 'amarkhel/23/travel (6).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (42, 'Fun', 'amarkhel/23/travel (7).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (43, 'Fun', 'amarkhel/23/travel (8).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (44, 'Fun', 'amarkhel/23/travel (9).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (45, 'Fun', 'amarkhel/23/travel (10).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (46, 'Fun', 'amarkhel/23/travel (11).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (47, 'Fun', 'amarkhel/23/travel (12).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (48, 'Fun', 'amarkhel/23/travel (13).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (49, 'Fun', 'amarkhel/23/travel (14).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (50, 'Fun', 'amarkhel/23/travel (15).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (51, 'Fun', 'amarkhel/23/travel (16).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (52, 'Fun', 'amarkhel/25/beach (1).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (53, 'Fun', 'amarkhel/25/beach (2).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (54, 'Fun', 'amarkhel/25/beach (3).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (55, 'Fun', 'amarkhel/25/beach (4).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (56, 'Fun', 'amarkhel/25/beach (5).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (57, 'Fun', 'amarkhel/25/beach (6).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (58, 'Fun', 'amarkhel/25/beach (7).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (59, 'Fun', 'amarkhel/25/beach (8).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (60, 'Fun', 'amarkhel/25/beach (9).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (61, 'Fun', 'amarkhel/25/beach (10).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (62, 'Fun', 'amarkhel/25/beach (11).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (63, 'Fun', 'amarkhel/25/beach (12).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (64, 'Fun', 'amarkhel/25/beach (13).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (65, 'Fun', 'amarkhel/25/beach (14).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (66, 'Fun', 'amarkhel/25/beach.jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (67, 'Fun', 'Noname/26/flowers (1).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (68, 'Fun', 'Noname/26/flowers (2).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (69, 'Fun', 'Noname/26/flowers (3).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (70, 'Fun', 'Noname/26/flowers (4).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (71, 'Fun', 'Noname/26/flowers (5).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (72, 'Fun', 'Noname/26/flowers (6).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (73, 'Fun', 'Noname/26/flowers (7).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (74, 'Fun', 'Noname/26/flowers (8).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (75, 'Fun', 'Noname/26/flowers (9).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (76, 'Fun', 'Noname/26/flowers (10).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (77, 'Fun', 'Noname/26/flowers (11).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (78, 'Fun', 'Noname/26/flowers (12).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (79, 'Fun', 'Noname/26/flowers (13).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (80, 'Fun', 'Noname/26/flowers (14).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (81, 'Fun', 'Noname/26/flowers (15).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (82, 'Fun', 'Noname/26/flowers (16).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
+INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (83, 'Fun', 'Noname/26/flowers.jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-
-
-
-
-
-
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (500, 'Sport1', 'amarkhel/20/sport.jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (501, 'Sport1', 'amarkhel/20/sport (1).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (502, 'Sport1', 'amarkhel/20/sport (2).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (503, 'Sport1', 'amarkhel/20/sport (3).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (504, 'Sport1', 'amarkhel/20/sport (4).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (505, 'Sport1', 'amarkhel/20/sport (5).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (506, 'Sport1', 'amarkhel/20/sport (6).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (507, 'Sport1', 'amarkhel/20/sport (7).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (508, 'Sport1', 'amarkhel/20/sport (8).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (509, 'Sport1', 'amarkhel/20/sport (9).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (510, 'Sport1', 'amarkhel/20/sport (10).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (511, 'Sport1', 'amarkhel/20/sport (11).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (512, 'Sport1', 'amarkhel/20/sport (12).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (513, 'Sport1', 'amarkhel/20/sport (13).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (514, 'Sport1', 'amarkhel/20/sport (14).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (515, 'Sport1', 'amarkhel/20/sport (15).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (516, 'Sport1', 'amarkhel/20/sport (16).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (517, 'Sport1', 'amarkhel/20/sport (17).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 500, 20, 375, '2008-12-01');
-
-
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (557, 'Fun', 'amarkhel/23/flowers.jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (558, 'Fun', 'amarkhel/23/flowers (1).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (559, 'Fun', 'amarkhel/23/flowers (2).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (560, 'Fun', 'amarkhel/23/flowers (3).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (561, 'Fun', 'amarkhel/23/flowers (4).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (562, 'Fun', 'amarkhel/23/flowers (5).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (563, 'Fun', 'amarkhel/23/flowers (6).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (564, 'Fun', 'amarkhel/23/flowers (7).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (565, 'Fun', 'amarkhel/23/flowers (8).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (566, 'Fun', 'amarkhel/23/flowers (9).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (567, 'Fun', 'amarkhel/23/flowers (10).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (568, 'Fun', 'amarkhel/23/flowers (11).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (569, 'Fun', 'amarkhel/23/flowers (12).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (570, 'Fun', 'amarkhel/23/flowers (13).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (571, 'Fun', 'amarkhel/23/flowers (14).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (572, 'Fun', 'amarkhel/23/flowers (15).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (573, 'Fun', 'amarkhel/23/flowers (16).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 500, 20, 375, '2008-12-01');
-
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (591, 'Fun', 'amarkhel/25/beach (1).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (592, 'Fun', 'amarkhel/25/beach (2).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (593, 'Fun', 'amarkhel/25/beach (3).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (594, 'Fun', 'amarkhel/25/beach (4).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (595, 'Fun', 'amarkhel/25/beach (5).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (596, 'Fun', 'amarkhel/25/beach (6).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (597, 'Fun', 'amarkhel/25/beach (7).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (598, 'Fun', 'amarkhel/25/beach (8).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (599, 'Fun', 'amarkhel/25/beach (9).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (600, 'Fun', 'amarkhel/25/beach (10).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (601, 'Fun', 'amarkhel/25/beach (11).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (602, 'Fun', 'amarkhel/25/beach (12).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (603, 'Fun', 'amarkhel/25/beach (13).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (604, 'Fun', 'amarkhel/25/beach (14).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (605, 'Fun', 'amarkhel/25/beach.jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 500, 20, 375, '2008-12-01');
-
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (606, 'Fun', 'Noname/26/travel (1).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (607, 'Fun', 'Noname/26/travel (2).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (608, 'Fun', 'Noname/26/travel (3).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (609, 'Fun', 'Noname/26/travel (4).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (610, 'Fun', 'Noname/26/travel (5).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (611, 'Fun', 'Noname/26/travel (6).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (612, 'Fun', 'Noname/26/travel (7).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (613, 'Fun', 'Noname/26/travel (8).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (614, 'Fun', 'Noname/26/travel (9).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (615, 'Fun', 'Noname/26/travel (10).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (616, 'Fun', 'Noname/26/travel (11).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (617, 'Fun', 'Noname/26/travel (12).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (618, 'Fun', 'Noname/26/travel (13).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (619, 'Fun', 'Noname/26/travel (14).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (620, 'Fun', 'Noname/26/travel (15).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (621, 'Fun', 'Noname/26/travel (16).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (622, 'Fun', 'Noname/26/travel.jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 500, 20, 375, '2008-12-01');
-
INSERT INTO metatags(metatag_id, tag) VALUES (1, 'Beach');
INSERT INTO metatags(metatag_id, tag) VALUES (2, 'Cool');
INSERT INTO metatags(metatag_id, tag) VALUES (3, 'Nature');
INSERT INTO metatags(metatag_id, tag) VALUES (4, 'JBoss');
INSERT INTO metatags(metatag_id, tag) VALUES (5, 'RichFaces');
-INSERT INTO metatags(metatag_id, tag) VALUES (6, 'Arktur');
+INSERT INTO metatags(metatag_id, tag) VALUES (6, 'Flowers');
INSERT INTO metatags(metatag_id, tag) VALUES (7, 'Sun');
-INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES(98, 1);
-INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES(98, 2);
-INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES(98, 3);
-INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES(98, 4);
-INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES(98, 5);
-INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES(98, 6);
-INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES(98, 7);
-INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES(99, 1);
+INSERT INTO metatags(metatag_id, tag) VALUES (8, 'Door');
+INSERT INTO metatags(metatag_id, tag) VALUES (9, 'Football');
+INSERT INTO metatags(metatag_id, tag) VALUES (10, 'Car');
+INSERT INTO metatags(metatag_id, tag) VALUES (11, 'Java');
+INSERT INTO metatags(metatag_id, tag) VALUES (12, 'JSF');
+INSERT INTO metatags(metatag_id, tag) VALUES (13, 'Window');
+INSERT INTO metatags(metatag_id, tag) VALUES (14, 'Selection');
+INSERT INTO metatags(metatag_id, tag) VALUES (15, 'Conversation');
+INSERT INTO metatags(metatag_id, tag) VALUES (16, 'Trip');
+INSERT INTO metatags(metatag_id, tag) VALUES (17, 'Rock');
+INSERT INTO metatags(metatag_id, tag) VALUES (18, 'Stone');
+INSERT INTO metatags(metatag_id, tag) VALUES (19, 'Boy');
+INSERT INTO metatags(metatag_id, tag) VALUES (20, 'Man');
+INSERT INTO metatags(metatag_id, tag) VALUES (21, 'Freedom');
+INSERT INTO metatags(metatag_id, tag) VALUES (22, 'USA');
+INSERT INTO metatags(metatag_id, tag) VALUES (23, 'Britain');
+INSERT INTO metatags(metatag_id, tag) VALUES (24, 'Sweden');
+INSERT INTO metatags(metatag_id, tag) VALUES (25, 'Italy');
+INSERT INTO metatags(metatag_id, tag) VALUES (26, 'France');
+INSERT INTO metatags(metatag_id, tag) VALUES (27, 'Sport');
+INSERT INTO metatags(metatag_id, tag) VALUES (28, 'Handball');
+INSERT INTO metatags(metatag_id, tag) VALUES (29, 'Hockey');
+INSERT INTO metatags(metatag_id, tag) VALUES (30, 'Photo');
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1,1);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(10,71);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,39);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,38);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(24,19);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(10,39);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,55);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,40);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,4);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(24,71);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(15,44);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(28,62);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(18,3);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(7,9);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(7,1);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(17,49);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5,78);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(15,47);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,48);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(22,8);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(10,22);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,70);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,50);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5,8);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(8,63);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,5);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(19,45);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(26,6);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(12,34);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(26,3);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,33);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(14,14);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(17,75);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(26,82);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(22,50);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(10,14);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(15,45);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(14,36);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(13,68);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(7,13);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(11,61);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(7,17);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(22,79);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(23,29);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,53);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,12);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(12,28);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,56);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(15,42);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(8,57);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(14,42);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(17,32);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(29,71);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(26,37);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,33);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(24,33);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1,63);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(7,22);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(22,4);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,46);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(8,78);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(19,21);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(26,76);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(7,15);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,22);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(18,72);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,75);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,69);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(23,76);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(15,51);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,14);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(28,19);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(13,35);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(12,48);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(18,71);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(30,36);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,50);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(18,23);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(13,29);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,61);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4,4);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(11,49);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5,40);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(26,59);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(28,76);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(18,42);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(22,78);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(28,58);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,7);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(11,17);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(21,30);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,23);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,54);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(25,81);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(11,65);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(13,16);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1,65);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(14,36);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(11,57);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,50);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(19,66);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(15,33);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(28,4);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,80);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(16,41);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(25,40);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(21,21);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,47);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,21);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(26,57);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(11,66);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(17,27);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(15,10);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(18,71);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(7,68);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,46);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(14,37);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,49);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4,72);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,80);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(13,5);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(24,76);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(28,46);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,40);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,67);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(18,14);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,57);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(29,16);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(12,39);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(16,44);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,74);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(13,64);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(23,58);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(11,81);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,70);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(23,79);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,76);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(16,27);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,25);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(8,41);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(16,46);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(10,33);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(19,80);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6,70);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,45);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4,79);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(25,15);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(19,70);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(7,15);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(8,2);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,39);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(4,17);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(8,73);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,28);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(8,66);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,79);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6,23);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(8,62);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(17,27);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(10,81);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(25,81);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(19,14);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1,80);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1,1);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,42);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(14,70);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(16,4);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(21,53);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,15);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(26,39);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(19,3);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(16,27);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6,80);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,34);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(23,79);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(15,24);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(14,32);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(5,45);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1,58);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,67);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1,62);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,76);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(6,15);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,18);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,44);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(22,14);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(16,12);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(23,26);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(25,2);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(10,25);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(9,19);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,30);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(2,49);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(3,18);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(14,20);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(12,65);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(13,35);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(1,25);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(27,29);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(17,79);
+INSERT INTO IMAGES_METATAGS(CI_METATAG_ID, CI_IMAGE_ID) VALUES(20,27);
INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(23, 1);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(15, 1);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(20, 1);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(26, 1);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(25, 1);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(27, 1);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(23, 2);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(15, 3);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(20, 4);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(26, 5);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(25, 6);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(27, 7);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(23, 8);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(15, 9);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(20, 10);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(26, 11);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(25, 12);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(27, 13);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(23, 14);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(15, 15);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(20, 16);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(26, 17);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(25, 18);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(27, 19);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(23, 20);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(15, 21);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(20, 22);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(26, 23);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(25, 24);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(27, 25);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(23, 26);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(15, 27);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(20, 28);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(26, 29);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(25, 30);
+INSERT INTO ALBUMS_METATAGS(CI_ALBUM_ID, CI_METATAG_ID) VALUES(27, 30);
-INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (1, '1985-01-08', 'Hello I am user', 98, 2);
-INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (2, '1985-01-08', 'Hello I am user2', 98, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (1, '1985-01-08', 'Hello I am user', 1, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (2, '1985-01-08', 'Hello I am user2', 1, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (3, '1985-01-08', 'Hello I am user',2, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (4, '1985-01-08', 'Hello I am user2',2, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (5, '1985-01-08', 'Hello I am user',3, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (6, '1985-01-08', 'Hello I am user2',3, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (7, '1985-01-08', 'Hello I am user',4, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (8, '1985-01-08', 'Hello I am user2',4, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (9, '1985-01-08', 'Hello I am user',5, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (10, '1985-01-08', 'Hello I am user2',5, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (11, '1985-01-08', 'Hello I am user',6, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (12, '1985-01-08', 'Hello I am user2',6, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (13, '1985-01-08', 'Hello I am user',7, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (14, '1985-01-08', 'Hello I am user2',7, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (15, '1985-01-08', 'Hello I am user',8, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (16, '1985-01-08', 'Hello I am user2',8, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (17, '1985-01-08', 'Hello I am user',9, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (18, '1985-01-08', 'Hello I am user2',9, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (19, '1985-01-08', 'Hello I am user',10, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (20, '1985-01-08', 'Hello I am user2',10, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (21, '1985-01-08', 'Hello I am user',11, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (22, '1985-01-08', 'Hello I am user2',11, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (23, '1985-01-08', 'Hello I am user',12, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (24, '1985-01-08', 'Hello I am user2',12, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (25, '1985-01-08', 'Hello I am user',13, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (26, '1985-01-08', 'Hello I am user2',13, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (27, '1985-01-08', 'Hello I am user',14, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (28, '1985-01-08', 'Hello I am user2',14, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (29, '1985-01-08', 'Hello I am user',15, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (30, '1985-01-08', 'Hello I am user2',15, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (31, '1985-01-08', 'Hello I am user',16, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (32, '1985-01-08', 'Hello I am user2',16, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (33, '1985-01-08', 'Hello I am user',17, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (34, '1985-01-08', 'Hello I am user2',17, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (35, '1985-01-08', 'Hello I am user',18, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (36, '1985-01-08', 'Hello I am user2',18, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (37, '1985-01-08', 'Hello I am user',19, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (38, '1985-01-08', 'Hello I am user2',19, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (39, '1985-01-08', 'Hello I am user',20, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (40, '1985-01-08', 'Hello I am user2',20, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (41, '1985-01-08', 'Hello I am user',21, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (42, '1985-01-08', 'Hello I am user2',21, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (43, '1985-01-08', 'Hello I am user',22, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (44, '1985-01-08', 'Hello I am user2',22, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (45, '1985-01-08', 'Hello I am user',23, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (46, '1985-01-08', 'Hello I am user2',23, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (47, '1985-01-08', 'Hello I am user',24, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (48, '1985-01-08', 'Hello I am user2',24, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (49, '1985-01-08', 'Hello I am user',25, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (50, '1985-01-08', 'Hello I am user2',25, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (51, '1985-01-08', 'Hello I am user',26, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (52, '1985-01-08', 'Hello I am user2',26, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (53, '1985-01-08', 'Hello I am user',27, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (54, '1985-01-08', 'Hello I am user2',27, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (55, '1985-01-08', 'Hello I am user',28, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (56, '1985-01-08', 'Hello I am user2',28, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (57, '1985-01-08', 'Hello I am user',29, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (58, '1985-01-08', 'Hello I am user2',29, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (59, '1985-01-08', 'Hello I am user',30, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (60, '1985-01-08', 'Hello I am user2',30, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (61, '1985-01-08', 'Hello I am user',31, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (62, '1985-01-08', 'Hello I am user2',31, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (63, '1985-01-08', 'Hello I am user',32, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (64, '1985-01-08', 'Hello I am user2',32, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (65, '1985-01-08', 'Hello I am user',33, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (66, '1985-01-08', 'Hello I am user2',33, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (67, '1985-01-08', 'Hello I am user',34, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (68, '1985-01-08', 'Hello I am user2',34, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (69, '1985-01-08', 'Hello I am user',35, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (70, '1985-01-08', 'Hello I am user2',35, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (71, '1985-01-08', 'Hello I am user',36, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (72, '1985-01-08', 'Hello I am user2',36, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (73, '1985-01-08', 'Hello I am user',37, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (74, '1985-01-08', 'Hello I am user2',37, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (75, '1985-01-08', 'Hello I am user',38, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (76, '1985-01-08', 'Hello I am user2',38, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (77, '1985-01-08', 'Hello I am user',39, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (78, '1985-01-08', 'Hello I am user2',39, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (79, '1985-01-08', 'Hello I am user',40, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (80, '1985-01-08', 'Hello I am user2',40, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (81, '1985-01-08', 'Hello I am user',41, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (82, '1985-01-08', 'Hello I am user2',41, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (83, '1985-01-08', 'Hello I am user',42, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (84, '1985-01-08', 'Hello I am user2',42, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (85, '1985-01-08', 'Hello I am user',43, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (86, '1985-01-08', 'Hello I am user2',43, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (87, '1985-01-08', 'Hello I am user',44, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (88, '1985-01-08', 'Hello I am user2',44, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (89, '1985-01-08', 'Hello I am user',45, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (90, '1985-01-08', 'Hello I am user2',45, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (91, '1985-01-08', 'Hello I am user',46, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (92, '1985-01-08', 'Hello I am user2',46, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (93, '1985-01-08', 'Hello I am user',47, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (94, '1985-01-08', 'Hello I am user2',47, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (95, '1985-01-08', 'Hello I am user',48, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (96, '1985-01-08', 'Hello I am user2',48, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (97, '1985-01-08', 'Hello I am user',49, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (98, '1985-01-08', 'Hello I am user2',49, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (99, '1985-01-08', 'Hello I am user',50, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (100, '1985-01-08', 'Hello I am user2',50, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (101, '1985-01-08', 'Hello I am user',51, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (102, '1985-01-08', 'Hello I am user2',51, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (103, '1985-01-08', 'Hello I am user',52, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (104, '1985-01-08', 'Hello I am user2',52, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (105, '1985-01-08', 'Hello I am user',53, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (106, '1985-01-08', 'Hello I am user2',53, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (107, '1985-01-08', 'Hello I am user',54, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (108, '1985-01-08', 'Hello I am user2',54, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (109, '1985-01-08', 'Hello I am user',55, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (110, '1985-01-08', 'Hello I am user2',55, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (111, '1985-01-08', 'Hello I am user',56, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (112, '1985-01-08', 'Hello I am user2',56, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (113, '1985-01-08', 'Hello I am user',57, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (114, '1985-01-08', 'Hello I am user2',57, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (115, '1985-01-08', 'Hello I am user',58, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (116, '1985-01-08', 'Hello I am user2',58, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (117, '1985-01-08', 'Hello I am user',59, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (118, '1985-01-08', 'Hello I am user2',59, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (119, '1985-01-08', 'Hello I am user',60, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (120, '1985-01-08', 'Hello I am user2',60, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (121, '1985-01-08', 'Hello I am user',61, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (122, '1985-01-08', 'Hello I am user2',61, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (123, '1985-01-08', 'Hello I am user',62, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (124, '1985-01-08', 'Hello I am user2',62, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (125, '1985-01-08', 'Hello I am user',63, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (126, '1985-01-08', 'Hello I am user2',63, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (127, '1985-01-08', 'Hello I am user',64, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (128, '1985-01-08', 'Hello I am user2',64, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (129, '1985-01-08', 'Hello I am user',65, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (130, '1985-01-08', 'Hello I am user2',65, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (131, '1985-01-08', 'Hello I am user',66, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (132, '1985-01-08', 'Hello I am user2',66, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (133, '1985-01-08', 'Hello I am user',67, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (134, '1985-01-08', 'Hello I am user2',67, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (135, '1985-01-08', 'Hello I am user',68, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (136, '1985-01-08', 'Hello I am user2',68, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (137, '1985-01-08', 'Hello I am user',69, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (138, '1985-01-08', 'Hello I am user2',69, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (139, '1985-01-08', 'Hello I am user',70, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (140, '1985-01-08', 'Hello I am user2',70, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (141, '1985-01-08', 'Hello I am user',71, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (142, '1985-01-08', 'Hello I am user2',71, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (143, '1985-01-08', 'Hello I am user',72, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (144, '1985-01-08', 'Hello I am user2',72, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (145, '1985-01-08', 'Hello I am user',73, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (146, '1985-01-08', 'Hello I am user2',73, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (147, '1985-01-08', 'Hello I am user',74, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (148, '1985-01-08', 'Hello I am user2',74, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (149, '1985-01-08', 'Hello I am user',75, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (150, '1985-01-08', 'Hello I am user2',75, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (151, '1985-01-08', 'Hello I am user',76, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (152, '1985-01-08', 'Hello I am user2',76, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (153, '1985-01-08', 'Hello I am user',77, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (154, '1985-01-08', 'Hello I am user2',77, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (155, '1985-01-08', 'Hello I am user',78, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (156, '1985-01-08', 'Hello I am user2',78, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (157, '1985-01-08', 'Hello I am user',79, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (158, '1985-01-08', 'Hello I am user2',79, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (159, '1985-01-08', 'Hello I am user',80, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (160, '1985-01-08', 'Hello I am user2',80, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (161, '1985-01-08', 'Hello I am user',81, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (162, '1985-01-08', 'Hello I am user2',81, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (163, '1985-01-08', 'Hello I am user',82, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (164, '1985-01-08', 'Hello I am user2',82, 3);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (165, '1985-01-08', 'Hello I am user',83, 2);
+INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (166, '1985-01-08', 'Hello I am user2',83, 3);
INSERT INTO shared_albums(album_id, user_id) VALUES(15, 1);
INSERT INTO shared_albums(album_id, user_id) VALUES(26, 1);
-INSERT INTO shared_images(image_id, user_id) VALUES(102, 1);
-INSERT INTO shared_images(image_id, user_id) VALUES(104, 1);
\ No newline at end of file
+INSERT INTO shared_images(image_id, user_id) VALUES(34, 1);
+INSERT INTO shared_images(image_id, user_id) VALUES(45, 1);
\ No newline at end of file
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12822 - in trunk/test-applications/realworld2: web/src/main/java/org/richfaces/realworld/modalpanel and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-04 08:20:50 -0500 (Wed, 04 Mar 2009)
New Revision: 12822
Added:
trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/modalpanel/test.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/TagCloudBean.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml
Log:
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2009-03-04 12:49:02 UTC (rev 12821)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2009-03-04 13:20:50 UTC (rev 12822)
@@ -24,6 +24,7 @@
import org.richfaces.realworld.domain.Comment;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.MetaTag;
@Local
public interface IImageAction {
@@ -38,4 +39,6 @@
public void addComment(Comment comment);
+ public abstract MetaTag getTagByName(String tag);
+
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-04 12:49:02 UTC (rev 12821)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-04 13:20:50 UTC (rev 12822)
@@ -97,4 +97,8 @@
comment.getImage().addComment(comment);
em.flush();
}
+
+ public MetaTag getTagByName(String tag) {
+ return (MetaTag)em.createQuery("from MetaTag m where m.tag =:tag").setParameter("tag", tag).getSingleResult();
+ }
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/modalpanel/test.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/modalpanel/test.java 2009-03-04 12:49:02 UTC (rev 12821)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/modalpanel/test.java 2009-03-04 13:20:50 UTC (rev 12822)
@@ -4,10 +4,13 @@
import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
+import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Random;
import javax.imageio.ImageIO;
import javax.imageio.stream.FileImageInputStream;
@@ -26,9 +29,10 @@
* @throws IOException
*/
public static void main(String[] args) throws IOException {
- String directory ="C:\\Documents and Settings\\Administrator\\Desktop\\amarkhel\\Sport";
+ /*String directory ="C:\\Documents and Settings\\Administrator\\Desktop\\amarkhel\\Sport";
writeFiles(directory, "_mini", 150);
- writeFiles(directory, "_medium", 600);
+ writeFiles(directory, "_medium", 600);*/
+ generateTags();
}
/*public static void renameAllImagesFromAlbumAndChilds(Album album, String replace,
@@ -90,6 +94,23 @@
return begin + substitute + end;
}
+ private static void generateTags(){
+ try {
+ BufferedWriter out = new BufferedWriter(new FileWriter("C:\\1114.txt"));
+ //String a ="INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES ("+commentId+", '1985-01-08', 'Hello I am user',"+ imageId+", 2);\n"+ "INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES ("+commentId2+", '1985-01-08', 'Hello I am user2',"+ imageId+", 3);\n";
+
+ //out.write("INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES("+"1"+"," +"1"+ ");\n");
+ for(int i =2; i<84; i++){
+ String imageId =(new Integer(i)).toString();
+ String commentId = (new Integer(i*2 -1)).toString();
+ String commentId2 = (new Integer(i*2)).toString();
+ out.append("INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES ("+commentId +", '1985-01-08', 'Hello I am user',"+ imageId+", 2);\n"+ "INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES ("+commentId2+", '1985-01-08', 'Hello I am user2',"+ imageId+", 3);\n");
+ }
+ out.close();
+ } catch (IOException e) {
+ }
+
+ }
/*private static void transform() throws IOException{
File temp = new File("E:\\richfaces\\test-applications\\realworld\\Upload\\galleries\\Nature\\1.jpg");
BufferedImage bsrc =null;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-04 12:49:02 UTC (rev 12821)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-04 13:20:50 UTC (rev 12822)
@@ -29,7 +29,7 @@
ALBUM_PREVIEW("includes/userImage.xhtml"),
SHELF_PREVIEW("/includes/userAlbum.xhtml"),
ALL_SHELFS("/includes/userShelfs.xhtml"),
- TAGS("includes/tags.xhtml"),
+ TAGS("includes/tag.xhtml"),
ALL_ALBUMS("includes/albums.xhtml"),
ALL_IMAGES("includes/images.xhtml");
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java 2009-03-04 12:49:02 UTC (rev 12821)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/servlet/PictureServlet.java 2009-03-04 13:20:50 UTC (rev 12822)
@@ -46,11 +46,8 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String pathInfo = request.getPathInfo();
- if(pathInfo.startsWith("/")){
- pathInfo = pathInfo.substring(1);
- }
String fileName = URLDecoder.decode(WebUtil.getFileName(pathInfo), "UTF8");
- if(!isAccessGranted(request, response, pathInfo)){
+ if(!isAccessGranted(request, response, fileName)){
sendToErrorPage(request, response);
return;
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/TagCloudBean.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/TagCloudBean.java 2009-03-04 12:49:02 UTC (rev 12821)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/TagCloudBean.java 2009-03-04 13:20:50 UTC (rev 12822)
@@ -9,9 +9,13 @@
import javax.faces.event.ActionEvent;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.core.Events;
+import org.richfaces.realworld.navigation.NavigationEnum;
+import org.richfaces.realworld.service.IImageAction;
/**
@@ -23,7 +27,7 @@
@Name("tagCloudBean")
@Scope(ScopeType.CONVERSATION)
public class TagCloudBean {
-
+ @In(create=true) IImageAction imageAction;
/** Min possible rank for tag */
static final int MIN_RANK = 0;
@@ -54,15 +58,9 @@
int i = rank / RANK_LEVEL_STEP;
return TAG_CSS_CLASSSES[i];
}
-
-
-
- /**
- * Action listener for tag click
- * @param event
- */
- public void processTagClick(ActionEvent event) {
- // TODO: implement this
- }
+ public void selectTag(String tag){
+ Events.instance().raiseEvent("updateMainArea", NavigationEnum.TAGS);
+ Events.instance().raiseEvent("updateSelectedTag",imageAction.getTagByName(tag));
+ }
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-04 12:49:02 UTC (rev 12821)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-04 13:20:50 UTC (rev 12822)
@@ -42,6 +42,7 @@
import org.richfaces.model.TreeRowKey;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.MetaTag;
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.navigation.NavigationEnum;
@@ -71,6 +72,8 @@
private User secondSelectedUser;
+ private MetaTag selectedTag;
+
private NavigationEnum mainArea;
//@In
@@ -363,4 +366,14 @@
public User getUser() {
return user;
}
+
+
+
+ public MetaTag getSelectedTag() {
+ return selectedTag;
+ }
+ @Observer("updateSelectedTag")
+ public void setSelectedTag(MetaTag selectedTag) {
+ this.selectedTag = selectedTag;
+ }
}
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml 2009-03-04 12:49:02 UTC (rev 12821)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml 2009-03-04 13:20:50 UTC (rev 12822)
@@ -8,8 +8,8 @@
<a4j:outputPanel layout="block" style="width: 200px">
<h:form>
<c:forEach items="#{tagList}" var="tag">
- <a4j:commandLink value="#{tag.key}"
- actionListener="#{tagCloudBean.processTagClick(tag.key)}"
+ <a4j:commandLink value="#{tag.key}" reRender="mainArea"
+ actionListener="#{tagCloudBean.selectTag(tag.key)}"
styleClass="#{tagCloudBean.getTagCssClass(tag.value)}"></a4j:commandLink>
</c:forEach>
</h:form>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12821 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/ajaxOutputPanel and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-03-04 07:49:02 -0500 (Wed, 04 Mar 2009)
New Revision: 12821
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxOutputPanel/ajaxOutputPanelTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxOutputPanelTest.java
Log:
RF-6197
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java 2009-03-04 11:21:30 UTC (rev 12820)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java 2009-03-04 12:49:02 UTC (rev 12821)
@@ -29,13 +29,20 @@
private String layout;
+ private Boolean ajaxRendered;
+
private String outputText;
public void init() {
layout = "inline";
+ ajaxRendered = false;
outputText = "text";
}
+ public void submit() {
+ outputText = "changed";
+ }
+
public void setOutputText(String outputText) {
this.outputText = outputText;
}
@@ -51,4 +58,12 @@
public String getLayout() {
return layout;
}
+
+ public void setAjaxRendered(Boolean ajaxRendered) {
+ this.ajaxRendered = ajaxRendered;
+ }
+
+ public Boolean getAjaxRendered() {
+ return ajaxRendered;
+ }
}
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxOutputPanel/ajaxOutputPanelTest.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxOutputPanelTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxOutputPanelTest.java 2009-03-04 11:21:30 UTC (rev 12820)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxOutputPanelTest.java 2009-03-04 12:49:02 UTC (rev 12821)
@@ -35,19 +35,28 @@
private String layout;
+ private String ajaxRendered;
+
+ private String reset;
+
private String mainForm;
private String outputPanel;
private String outputText;
+ private String submit;
+
private void init(Template template) {
renderPage(null, template, "#{a4jOutputPanelBean.init}");
String attrForm = getParentId() + "attrForm";
layout = attrForm + ":layout";
+ ajaxRendered = attrForm + ":ajaxRendered";
+ reset = attrForm + ":reset";
mainForm = getParentId() + "mainForm";
outputPanel = mainForm + ":outputPanel";
outputText = mainForm + ":outputText";
+ submit = mainForm + ":submit";
}
/**
@@ -60,7 +69,23 @@
Assert.assertTrue(selenium.isElementPresent(outputText));
}
+ /**
+ * component with ajaxRendered = true is updated on each request
+ */
@Test
+ public void testAjaxRendered(Template template) {
+ init(template);
+ Assert.assertEquals(selenium.getText(outputText), "text");
+ clickAjaxCommandAndWait(submit);
+ Assert.assertEquals(selenium.getText(outputText), "text");
+ clickAjaxCommandAndWait(reset);
+ clickAjaxCommandAndWait(ajaxRendered);
+ Assert.assertEquals(selenium.getText(outputText), "text");
+ clickAjaxCommandAndWait(submit);
+ Assert.assertEquals(selenium.getText(outputText), "changed");
+ }
+
+ @Test
public void testLayoutAttribute(Template template) {
init(template);
Assert.assertEquals(selenium.getAttribute("xpath=id('" + mainForm + "')/span/span/span@id"), outputText);
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12820 - in trunk/test-applications/realworld2/web/src/main: webapp and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-04 06:21:30 -0500 (Wed, 04 Mar 2009)
New Revision: 12820
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/imagePreview.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/main.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
Log:
Realworld: add user album markup, add slideshow for album and image preview
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java 2009-03-04 11:20:55 UTC (rev 12819)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/slideshow/SlideshowBean.java 2009-03-04 11:21:30 UTC (rev 12820)
@@ -22,6 +22,8 @@
import java.io.Serializable;
+import javax.faces.event.ActionEvent;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -58,15 +60,15 @@
this.active = active;
}
- public void startSlideshow(){
+ public void startSlideshow(ActionEvent event){
active = true;
}
- public void stopSlideshow(){
+ public void stopSlideshow(ActionEvent event){
active = false;
}
- public void updateInterval(){
+ public void updateInterval(ActionEvent event){
this.setInterval((int)(Constants.DELAY * Long.valueOf(slideshowHelper.getInputSlider().getValue().toString())));
}
}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/imagePreview.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/main.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-04 11:20:55 UTC (rev 12819)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-04 11:21:30 UTC (rev 12820)
@@ -291,6 +291,9 @@
a{color : #DF6400;}
h1{font-size : 175%; font-weight : normal; margin : 0px;}
+.content_box {padding : 15px 35px 15px 35px;}
+.content_box p {margin : 0px 0px 5px 0px; FONT-SIZE : 12PX}
+
.preview_box_album_80 {width : 100px; height : 100px; position : relative; float : left; margin : 0px 10px 20px 0px;}
.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute;}
.preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;}
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12819 - in trunk/test-applications/realworld2/ejb/src/main: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-04 06:20:55 -0500 (Wed, 04 Mar 2009)
New Revision: 12819
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
Log:
Realworld: add user album markup, add slideshow for album and image preview
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-03-04 10:02:55 UTC (rev 12818)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-03-04 11:20:55 UTC (rev 12819)
@@ -23,6 +23,7 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType;
@@ -39,6 +40,8 @@
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
import javax.persistence.Transient;
import org.hibernate.validator.Length;
@@ -109,6 +112,9 @@
@JoinColumn(name = "PARENT_SHELF_ID", nullable = true)
@org.hibernate.annotations.ForeignKey(name = "FK_SHELF_PARENT_ID")
private Shelf parent;
+
+ @Temporal(TemporalType.TIMESTAMP)
+ private Date created;
// ********************** Accessor Methods ********************** //
@@ -288,4 +294,20 @@
public boolean isEmpty() {
return images == null || images.size() == 0;
}
+
+ /**
+ * @return the created
+ */
+ public Date getCreated() {
+ return created;
+ }
+
+ /**
+ * @param created the created to set
+ */
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+
}
Modified: trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-04 10:02:55 UTC (rev 12818)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-04 11:20:55 UTC (rev 12819)
@@ -6,16 +6,16 @@
INSERT INTO shelfs(shelf_id, name, description, shelf_user_id) VALUES (2, 'Sport', 'Nature pictures', 1);
INSERT INTO shelfs(shelf_id, name, description, shelf_user_id) VALUES (3, 'Water', 'Nature pictures', 2);
INSERT INTO shelfs(shelf_id, name, description, shelf_user_id) VALUES (4, 'Flowers', 'Nature pictures', 3);
-INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id) VALUES (15, 'Water', 'Rivers pictures', true, 2, 3);
+INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (15, 'Water', 'Rivers pictures', true, 2, 3, '2008-12-18');
-INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id) VALUES (20, 'Sport', 'Nature pictures', true, 1, 1);
+INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (20, 'Sport', 'Nature pictures', true, 1, 1, '2008-12-18');
-INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id) VALUES (26, 'Travel', 'Fun pictures', true, 1, 2);
-INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id) VALUES (25, 'Beach', 'Fun pictures', true, 1, 1);
-INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id) VALUES (23, 'Flowers', 'Fun pictures', true, 3, 4);
-INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id) VALUES (27, 'Very very very very very very very long album name ', 'Long name test', true, 1, 2);
+INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (26, 'Travel', 'Fun pictures', true, 1, 2, '2008-12-18');
+INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (25, 'Beach', 'Fun pictures', true, 1, 1, '2008-12-18');
+INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (23, 'Flowers', 'Fun pictures', true, 3, 4, '2008-12-18');
+INSERT INTO albums(album_id, name, description, shared, album_user_id, parent_shelf_id, created) VALUES (27, 'Very very very very very very very long album name ', 'Long name test', true, 1, 2, '2008-12-18');
INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, height, size, width, uploaded) VALUES (98, 'korana', 'Viking/15/korana.jpg', 'korana', '2008-12-18', 15, 'Canon S3', 1024, 1917.000000, 768, '2008-12-01');
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12818 - trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-03-04 05:02:55 -0500 (Wed, 04 Mar 2009)
New Revision: 12818
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
Log:
Update web.xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-04 09:33:10 UTC (rev 12817)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-04 10:02:55 UTC (rev 12818)
@@ -4,8 +4,26 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
- <!-- Ajax4jsf -->
+
+
+ <listener>
+ <listener-class>
+ org.jboss.seam.servlet.SeamListener
+ </listener-class>
+ </listener>
+
<filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+<!-- Ajax4jsf -->
+ <filter>
<display-name>Ajax4jsf Filter</display-name>
<filter-name>ajax4jsf</filter-name>
<filter-class>org.ajax4jsf.Filter</filter-class>
@@ -28,30 +46,13 @@
<param-name>org.richfaces.SKIN</param-name>
<param-value>realworld</param-value>
</context-param>
-
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tags/realWorld-taglib.xml</param-value>
+
+ <context-param>
+ <param-name>org.ajax4jsf.xmlparser.TIDY</param-name>
+ <param-value>/*</param-value>
</context-param>
<!-- Seam -->
-
- <listener>
- <listener-class>
- org.jboss.seam.servlet.SeamListener
- </listener-class>
- </listener>
-
- <filter>
- <filter-name>Seam Filter</filter-name>
- <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>Seam Filter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
<servlet>
<servlet-name>Seam Resource Servlet</servlet-name>
<servlet-class>
@@ -78,11 +79,9 @@
<param-value>.xhtml</param-value>
</context-param>
- <context-param>
+ <context-param>
<param-name>uploadRoot</param-name>
- <param-value>
- C:\Upload\
- </param-value>
+ <param-value>d:/Upload/</param-value>
</context-param>
@@ -120,5 +119,4 @@
<display-name>copyImageListener</display-name>
<listener-class>org.richfaces.realworld.listener.CopyImagesStuff</listener-class>
</listener>
-
</web-app>
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12817 - trunk/test-applications/jsp/src/main/webapp/Combobox.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2009-03-04 04:33:10 -0500 (Wed, 04 Mar 2009)
New Revision: 12817
Modified:
trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2009-03-04 01:25:32 UTC (rev 12816)
+++ trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2009-03-04 09:33:10 UTC (rev 12817)
@@ -1,57 +1,54 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<f:subview id="comboboxSubviewID">
- <h:inputText value="For test tabbing tabindex = 3" tabindex="3" size="30"></h:inputText> <br/>
+ <h:inputText value="For test tabbing tabindex = 3" tabindex="3"
+ size="30"></h:inputText>
+ <br />
- <rich:comboBox id="comboboxID" disabled="#{combobox.disabled}" defaultLabel="#{combobox.defaultLabel}"
- buttonClass="#{style.buttonClass}"
- buttonDisabledClass="#{style.buttonDisabledClass}"
- buttonDisabledStyle="#{style.buttonDisabledStyle}"
- buttonInactiveClass="#{style.buttonInactiveClass}"
- buttonInactiveStyle="#{style.buttonInactiveStyle}"
- buttonStyle="#{style.buttonStyle}"
- inputClass="#{style.inputClass}"
- inputDisabledClass="#{style.inputDisabledClass}"
- inputDisabledStyle="#{style.inputDisabledStyle}"
- inputInactiveClass="#{style.inputInactiveClass}"
- inputInactiveStyle="#{style.inputInactiveStyle}"
- itemClass="#{style.itemClass}"
- inputStyle="#{style.inputStyle}"
- listClass="#{style.listClass}"
- listStyle="#{style.listStyle}"
- filterNewValues="#{combobox.filterNewValues}"
- directInputSuggestions="#{combobox.directInputSuggestions}" immediate="#{combobox.immediate}"
- width="#{combobox.width}" valueChangeListener="#{combobox.valueChangeListener}"
- tabindex="#{combobox.tabindex}" suggestionValues="#{combobox.suggestionValues}"
- required="#{combobox.required}" requiredMessage="#{combobox.requiredMessage}"
- rendered="#{combobox.rendered}" selectFirstOnUpdate="#{combobox.selectFirstOnUpdate}"
- enableManualInput="#{combobox.enableManualInput}" listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}" style="#{style.style}" styleClass="#{style.styleClass}"
- onblur="#{event.onblur}"
- onchange="#{event.onchange}"
- onclick="#{event.onclick}"
- ondblclick="#{event.ondblclick}"
- onfocus="#{event.onfocus}"
- onkeydown="#{event.onkeydown}"
- onkeypress="#{event.onkeypress}"
- onkeyup="#{event.onkeyup}"
- onlistcall="#{event.onlistcall}"
- onmousedown="#{event.onmousedown}"
- onmousemove="#{event.onmousemove}"
- onmouseout="#{event.onmouseout}"
- onmouseover="#{event.onmouseover}"
- onmouseup="#{event.onmouseup}"
- onselect="#{event.onselect}"
- binding="#{combobox.htmlComboBox}"
- align="#{combobox.align}" >
- <f:selectItem itemValue="Gosha"/>
- <f:selectItem itemValue="DubSer_1"/>
- <f:selectItem itemValue="DubSer_2"/>
- </rich:comboBox>
-
- <a4j:commandButton value="reRender" reRender="comboboxID"></a4j:commandButton>
-
+ <rich:comboBox id="comboboxID" disabled="#{combobox.disabled}"
+ defaultLabel="#{combobox.defaultLabel}"
+ buttonClass="#{style.buttonClass}"
+ buttonDisabledClass="#{style.buttonDisabledClass}"
+ buttonDisabledStyle="#{style.buttonDisabledStyle}"
+ buttonInactiveClass="#{style.buttonInactiveClass}"
+ buttonInactiveStyle="#{style.buttonInactiveStyle}"
+ buttonStyle="#{style.buttonStyle}" inputClass="#{style.inputClass}"
+ inputDisabledClass="#{style.inputDisabledClass}"
+ inputDisabledStyle="#{style.inputDisabledStyle}"
+ inputInactiveClass="#{style.inputInactiveClass}"
+ inputInactiveStyle="#{style.inputInactiveStyle}"
+ itemClass="#{style.itemClass}" inputStyle="#{style.inputStyle}"
+ listClass="#{style.listClass}" listStyle="#{style.listStyle}"
+ filterNewValues="#{combobox.filterNewValues}"
+ directInputSuggestions="#{combobox.directInputSuggestions}"
+ immediate="#{combobox.immediate}" width="#{combobox.width}"
+ valueChangeListener="#{combobox.valueChangeListener}"
+ tabindex="#{combobox.tabindex}"
+ suggestionValues="#{combobox.suggestionValues}"
+ required="#{combobox.required}"
+ requiredMessage="#{combobox.requiredMessage}"
+ rendered="#{combobox.rendered}"
+ selectFirstOnUpdate="#{combobox.selectFirstOnUpdate}"
+ enableManualInput="#{combobox.enableManualInput}"
+ listHeight="#{combobox.listHeight}" listWidth="#{combobox.listWidth}"
+ style="#{style.style}" styleClass="#{style.styleClass}"
+ onblur="#{event.onblur}" onchange="#{event.onchange}"
+ onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+ onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}"
+ onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
+ onlistcall="#{event.onlistcall}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
+ onselect="#{event.onselect}" binding="#{combobox.htmlComboBox}">
+ <f:selectItem itemValue="Gosha" />
+ <f:selectItem itemValue="DubSer_1" />
+ <f:selectItem itemValue="DubSer_2" />
+ </rich:comboBox>
+
+ <a4j:commandButton value="reRender" reRender="comboboxID"></a4j:commandButton>
+
</f:subview>
\ No newline at end of file
15 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r12816 - in trunk: framework/impl/src/main/java/org/richfaces/skin and 7 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-03-03 20:25:32 -0500 (Tue, 03 Mar 2009)
New Revision: 12816
Added:
trunk/framework/api/src/main/java/org/richfaces/skin/Theme.java
trunk/framework/impl/src/main/java/org/richfaces/skin/ThemeImpl.java
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingInitialContextFactoryBuilder.java
trunk/framework/test/src/test/resources/META-INF/themes/
trunk/framework/test/src/test/resources/META-INF/themes/test.theme.properties
Modified:
trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java
trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspApplicationContext.java
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java
trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourcePathTest.java
trunk/framework/test/src/test/java/org/richfaces/skin/SkinTestCase.java
trunk/sandbox/ui/layout/src/main/config/component/page.xml
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
Log:
Page layout component view fixed.
Created 'theme' configuration structure.
Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -202,5 +202,12 @@
* @return
*/
public abstract Skin getBaseSkin(FacesContext facesContext);
+
+ /**
+ * @param facesContext
+ * @param name
+ * @return
+ */
+ public abstract Theme getTheme(FacesContext facesContext, String name);
}
Added: trunk/framework/api/src/main/java/org/richfaces/skin/Theme.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/skin/Theme.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/skin/Theme.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -0,0 +1,20 @@
+/**
+ *
+ */
+package org.richfaces.skin;
+
+/**
+ * @author asmirnov
+ *
+ */
+public interface Theme {
+
+ public String getRendererType();
+
+ public String getStyle();
+
+ public String getScript();
+
+ public Object getProperty(String name);
+
+}
Property changes on: trunk/framework/api/src/main/java/org/richfaces/skin/Theme.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -56,6 +56,7 @@
*/
public class SkinFactoryImpl extends SkinFactory {
+
/**
* Name of web application init parameter for current default
* {@link javax.faces.render.RenderKit } interaction. by default -
@@ -66,9 +67,11 @@
/**
* Resource Uri for properties file with default values of skin parameters.
*/
- private static final String DEFAULT_SKIN_PROPERTIES_RESOURCE = "META-INF/skins/DEFAULT.skin.properties";
+ private static final String DEFAULT_SKIN_PATH = "META-INF/skins/%s.skin.properties";
- private static final String DEFAULT_CONFIGURATION_RESOURCE = "META-INF/skins/DEFAULT.configuration.properties";
+ private static final String USER_SKIN_PATH = "%s.skin.properties";
+
+ // private static final String DEFAULT_CONFIGURATION_RESOURCE = "META-INF/skins/DEFAULT.configuration.properties";
/**
* Name of default skin . "DEFAULT" in this realisation.
*/
@@ -80,19 +83,22 @@
* user-defined.
*/
private static final String[] SKINS_PATHS = {
- "META-INF/skins/%s.skin.properties", "%s.skin.properties" };
- private static final String[] DEFAULT_SKIN_PATHS = { DEFAULT_SKIN_PROPERTIES_RESOURCE };
+ DEFAULT_SKIN_PATH, USER_SKIN_PATH };
+ private static final String[] THEME_PATHS = {
+ "META-INF/themes/%s.theme.properties", "%s.theme.properties" };
+// private static final String[] DEFAULT_SKIN_PATHS = { DEFAULT_SKIN_PATH };
- private static final String[] CONFIGURATIONS_PATHS = {
- "META-INF/skins/%s.configuration.properties",
- "%s.configuration.properties" };
- private static final String[] DEFAULT_CONFIGURATION_PATHS = { "META-INF/skins/DEFAULT.configuration.properties" };
+// private static final String[] CONFIGURATIONS_PATHS = {
+// "META-INF/skins/%s.configuration.properties",
+// "%s.configuration.properties" };
+// private static final String[] DEFAULT_CONFIGURATION_PATHS = { "META-INF/skins/DEFAULT.configuration.properties" };
- private Map skins = Collections.synchronizedMap(new HashMap());
- private Map baseSkins = Collections.synchronizedMap(new HashMap());
- private Map sourceProperties = Collections.synchronizedMap(new HashMap());
+ private Map<String,Skin> skins = new HashMap<String,Skin>();
+ private Map<String,Skin> baseSkins = new HashMap<String,Skin>();
+ private Map<String,Properties> sourceProperties = new HashMap<String,Properties>();
+ private Map<String,Theme> themes = new HashMap<String,Theme>();
- private Properties defaultSkinProperties = null;
+// private Properties defaultSkinProperties = null;
private String skinName = null;
private ValueExpression skinBinding = null;
private String baseSkinName = null;
@@ -108,25 +114,29 @@
throw new SkinNotFoundException(Messages
.getMessage(Messages.NULL_SKIN_NAME_ERROR));
}
+ Skin currentSkin = null;
// user binding return skin instance.
if (currentSkinOrName instanceof Skin) {
- return (Skin) currentSkinOrName;
- }
- String currentSkinName = currentSkinOrName.toString();
-
- Map skinsMap = (isBase ? baseSkins : skins);
- Skin currentSkin = (Skin) skinsMap.get(currentSkinName);
- // LAZY creation for skins, since, in case of EL expressions
- // for skin name, we don't can know all names of existing skins.
- if (currentSkin == null) {
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage(Messages.CREATE_SKIN_INFO,
- currentSkinName));
+ currentSkin = (Skin) currentSkinOrName;
+ } else {
+ String currentSkinName = currentSkinOrName.toString();
+
+ Map<String, Skin> skinsMap = (isBase ? baseSkins : skins);
+ synchronized (skinsMap) {
+ currentSkin = (Skin) skinsMap.get(currentSkinName);
+ // LAZY creation for skins, since, in case of EL expressions
+ // for skin name, we don't can know all names of existing skins.
+ if (currentSkin == null) {
+ if (log.isDebugEnabled()) {
+ log.debug(Messages.getMessage(
+ Messages.CREATE_SKIN_INFO, currentSkinName));
+ }
+ currentSkin = buildSkin(facesContext, currentSkinName,
+ isBase);
+ skinsMap.put(currentSkinName, currentSkin);
+ }
}
- currentSkin = buildSkin(facesContext, currentSkinName, isBase);
- skinsMap.put(currentSkinName, currentSkin);
}
-
return currentSkin;
}
@@ -146,47 +156,14 @@
return getSkinByName(context, currentSkinOrName, true);
}
- protected Properties getDefaultSkinProperties() {
- if (defaultSkinProperties == null) {
- defaultSkinProperties = loadDefaultProperties(DEFAULT_SKIN_PROPERTIES_RESOURCE);
- }
- return defaultSkinProperties;
- }
+// protected Properties getDefaultSkinProperties() {
+// if (defaultSkinProperties == null) {
+// defaultSkinProperties = loadProperties(DEFAULT_SKIN_NAME,DEFAULT_SKIN_PATHS);
+// }
+// return defaultSkinProperties;
+// }
/**
- *
- */
- private Properties loadDefaultProperties(String path) {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Properties defaultProperties = new Properties();
- try {
- Enumeration properties = loader.getResources(path);
- while (properties.hasMoreElements()) {
- URL url = (URL) properties.nextElement();
- InputStream propertyStream = null;
- try {
- propertyStream = URLToStreamHelper.urlToStream(url);
- defaultProperties.load(propertyStream);
- } catch (IOException e) {
- // DO Nothing...
- log.info(Messages.getMessage(
- Messages.DEFAULT_PROPERTIES_NOT_FOUND_ERROR, path),
- e);
- continue;
- } finally {
- if (null != propertyStream) {
- propertyStream.close();
- }
- }
- }
- } catch (IOException e) {
- log.info(Messages.getMessage(
- Messages.DEFAULT_PROPERTIES_NOT_FOUND_ERROR, path), e);
- }
- return defaultProperties;
- }
-
- /**
* Calculate name for current skin. For EL init parameter store value
* binding for speed calculations.
*
@@ -238,14 +215,14 @@
} else {
skin = currentSkinName;
}
- }
- if (useBase) {
- baseSkinBinding = binding;
- baseSkinName = skin;
- } else {
- skinBinding = binding;
- skinName = skin;
+ if (useBase) {
+ baseSkinBinding = binding;
+ baseSkinName = skin;
+ } else {
+ skinBinding = binding;
+ skinName = skin;
+ }
}
// }
@@ -294,15 +271,16 @@
*/
protected Skin buildSkin(FacesContext context, String name, boolean isBase)
throws SkinNotFoundException {
-
- Map<Object, Object> skinParams = (Map<Object, Object>) sourceProperties.get(name);
- if (skinParams == null) {
- skinParams = loadProperties(name, SKINS_PATHS);
- processProperties(context, skinParams);
- skinParams = Collections.unmodifiableMap(skinParams);
- sourceProperties.put(name, skinParams);
- }
-
+ Properties skinParams;
+ synchronized (sourceProperties) {
+ skinParams = sourceProperties.get(name);
+ if (skinParams == null) {
+ skinParams = loadProperties(name, SKINS_PATHS);
+ processProperties(context, skinParams);
+ // skinParams = Collections.unmodifiableMap(skinParams);
+ sourceProperties.put(name, skinParams);
+ }
+ }
BasicSkinImpl skinImpl;
if (DEFAULT_SKIN_NAME.equals(name)) {
skinImpl = new DefaultSkinImpl(skinParams);
@@ -323,45 +301,17 @@
* @throws FacesException
* @throws ReferenceSyntaxException
*/
- protected Map loadProperties(String name, String[] paths) throws SkinNotFoundException, FacesException,
- ReferenceSyntaxException {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ protected Properties loadProperties(String name, String[] paths) throws SkinNotFoundException, FacesException {
+ ClassLoader loader = getClassLoader();
// Get properties for concrete skin.
Properties skinProperties = new Properties();
int loadedPropertiesCount = 0;
for (int i = 0; i < paths.length; i++) {
- try {
- String skinPropertiesLocation = paths[i].replaceAll("%s", name);
- Enumeration properties = loader
- .getResources(skinPropertiesLocation);
- while (properties.hasMoreElements()) {
- URL url = (URL) properties.nextElement();
- InputStream propertyStream = null;
- try {
- propertyStream = URLToStreamHelper.urlToStream(url);
- skinProperties.load(propertyStream);
- loadedPropertiesCount++;
- } catch (IOException e) {
- log.warn(Messages
- .getMessage(Messages.SKIN_PROPERTIES_IO_ERROR),
- e);
- continue;
- } finally {
- if (null != propertyStream) {
- propertyStream.close();
- }
- }
- }
- } catch (IOException e) {
- // Do nothing - we can only log error, and continue to load next
- // property.
- if (log.isInfoEnabled()) {
- log.info(Messages
- .getMessage(Messages.SKIN_PROPERTIES_IO_ERROR), e);
- }
+ String skinPropertiesLocation = paths[i].replaceAll("%s", name);
+ if(loadProperties(loader, skinProperties, skinPropertiesLocation)){
+ loadedPropertiesCount++;
}
}
- // TODO - read skin from property file in WEB-INF directory.
if (loadedPropertiesCount == 0) {
throw new SkinNotFoundException(Messages.getMessage(
Messages.SKIN_NOT_FOUND_ERROR, name));
@@ -369,4 +319,62 @@
return skinProperties;
}
+ /**
+ * @return
+ */
+ protected ClassLoader getClassLoader() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+
+ /**
+ * @param loader
+ * @param properties
+ * @param location
+ */
+ protected boolean loadProperties(ClassLoader loader, Properties properties,
+ String location) {
+ boolean loaded = false;
+ try {
+ Enumeration<URL> resources = loader
+ .getResources(location);
+ while (resources.hasMoreElements()) {
+ URL url = (URL) resources.nextElement();
+ InputStream propertyStream = null;
+ try {
+ propertyStream = URLToStreamHelper.urlToStream(url);
+ properties.load(propertyStream);
+ loaded=true;
+ } catch (IOException e) {
+ log.warn(Messages
+ .getMessage(Messages.SKIN_PROPERTIES_IO_ERROR),
+ e);
+ continue;
+ } finally {
+ if (null != propertyStream) {
+ propertyStream.close();
+ }
+ }
+ }
+ } catch (IOException e) {
+ // Do nothing - we can only log error, and continue to load next
+ // property.
+ if (log.isInfoEnabled()) {
+ log.info(Messages
+ .getMessage(Messages.SKIN_PROPERTIES_IO_ERROR), e);
+ }
+ }
+ return loaded;
+ }
+
+ @Override
+ public Theme getTheme(FacesContext facesContext, String name) {
+ Theme theme = themes.get(name);
+ if(null == theme){
+ Properties properties = loadProperties(name, THEME_PATHS);
+ processProperties(facesContext, properties);
+ theme = new ThemeImpl(properties);
+ themes.put(name, theme);
+ }
+ return theme;
+ }
}
Added: trunk/framework/impl/src/main/java/org/richfaces/skin/ThemeImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/ThemeImpl.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/ThemeImpl.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -0,0 +1,59 @@
+/**
+ *
+ */
+package org.richfaces.skin;
+
+import java.util.Properties;
+
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ThemeImpl implements Theme {
+
+ private final Properties themeProperties;
+
+ /**
+ * @param themeProperties
+ */
+ public ThemeImpl(Properties themeProperties) {
+ this.themeProperties = themeProperties;
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.skin.Theme#getProperty(java.lang.String)
+ */
+ public Object getProperty(String name) {
+ Object property = themeProperties.get(name);
+ if (property instanceof ValueExpression) {
+ ValueExpression ve = (ValueExpression) property;
+ property = ve.getValue(FacesContext.getCurrentInstance().getELContext());
+ }
+ return property;
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.skin.Theme#getRendererType()
+ */
+ public String getRendererType() {
+ return (String) getProperty("rendererType");
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.skin.Theme#getScript()
+ */
+ public String getScript() {
+ return (String) getProperty("script");
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.skin.Theme#getStyle()
+ */
+ public String getStyle() {
+ return (String) getProperty("styleSheet");
+ }
+
+}
Property changes on: trunk/framework/impl/src/main/java/org/richfaces/skin/ThemeImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java
===================================================================
--- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/ServerResourcePath.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -16,9 +16,9 @@
private static final Pattern SLASH = Pattern.compile("/");
- public static final ServerResourcePath WEB_INF=new ServerResourcePath("/WEB-INF");
+ public static final ServerResourcePath WEB_INF=new ServerResourcePath("/WEB-INF/");
- public static final ServerResourcePath META_INF=new ServerResourcePath("/META-INF");
+ public static final ServerResourcePath META_INF=new ServerResourcePath("/META-INF/");
public static final ServerResourcePath WEB_XML=new ServerResourcePath("/WEB-INF/web.xml");
public static final ServerResourcePath FACES_CONFIG=new ServerResourcePath("/WEB-INF/faces-config.xml");
@@ -45,7 +45,13 @@
if (!path.startsWith("/")) {
throw new IllegalArgumentException();
}
- pathElements = SLASH.split(path);
+ String[] split = SLASH.split(path);
+ if(split.length >1 && path.endsWith("/")){
+ pathElements = new String[split.length+1];
+ System.arraycopy(split, 0, pathElements, 0, split.length);
+ } else {
+ pathElements = split;
+ }
}
/**
@@ -53,17 +59,21 @@
* @return true for a last element in the path.
*/
public boolean isFile() {
- return pathElements.length <= 1;
+ return pathElements.length <= 1 || null == pathElements[1];
}
/**
* Name of the next element ( directory or file ) name.
- * For the "/foo/bar/baz" it should be "foo" , /bar/baz : "bar" , "/" : null.
+ * For the "/foo/bar/baz" it should be "foo/" , /bar/baz : "bar/" , "/" : null.
* @return name of the next element or null if it is last element in the chain ( file ).
*/
public String getNextElementName() {
if (pathElements.length > 1) {
- return pathElements[1];
+ String name = pathElements[1];
+ if(pathElements.length>2){
+ name+='/';
+ }
+ return name;
} else {
return null;
}
@@ -75,7 +85,7 @@
* @return next subdirectory path or null.
*/
public ServerResourcePath getNextPath() {
- if (pathElements.length > 1) {
+ if (pathElements.length > 1 && null != pathElements[1]) {
String[] nextElenemts = new String[pathElements.length - 1];
System.arraycopy(pathElements, 1, nextElenemts, 0, nextElenemts.length);
return new ServerResourcePath(nextElenemts);
@@ -90,7 +100,10 @@
if (pathElements.length > 1) {
for (int i = 1; i < pathElements.length; i++) {
String element = pathElements[i];
- str.append("/").append(element);
+ str.append("/");
+ if(null != element){
+ str.append(element);
+ }
}
} else {
str.append("/");
Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspApplicationContext.java
===================================================================
--- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspApplicationContext.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StaggingJspApplicationContext.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -9,21 +9,35 @@
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspApplicationContext;
-import com.sun.el.ExpressionFactoryImpl;
+import org.richfaces.test.TestException;
+
/**
* @author asmirnov
*
*/
public class StaggingJspApplicationContext implements JspApplicationContext {
+ private static final String DEFAULT_EXPRESSION_FACTORY="com.sun.el.ExpressionFactoryImpl";
+
private final ExpressionFactory expressionFactory ;
private final ServletContext servletContext;
public StaggingJspApplicationContext(ServletContext servletContext) {
this.servletContext = servletContext;
- expressionFactory = ExpressionFactory.newInstance();
+ String elFactoryClass = servletContext.getInitParameter("com.sun.faces.expressionFactory");
+ if(null == elFactoryClass){
+ elFactoryClass = servletContext.getInitParameter("com.sun.el.ExpressionFactoryImpl");
+ }
+ if(null == elFactoryClass){
+ elFactoryClass = DEFAULT_EXPRESSION_FACTORY;
+ }
+ try {
+ expressionFactory = Class.forName(elFactoryClass).asSubclass(ExpressionFactory.class).newInstance();
+ } catch (Exception e) {
+ throw new TestException("Couldn't instantiate EL expression factory",e);
+ }
}
/* (non-Javadoc)
@@ -37,7 +51,6 @@
* @see javax.servlet.jsp.JspApplicationContext#addELResolver(javax.el.ELResolver)
*/
public void addELResolver(ELResolver resolver) {
-
}
/* (non-Javadoc)
Copied: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingInitialContextFactoryBuilder.java (from rev 12814, branches/jsf2.0/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingInitialContextFactoryBuilder.java)
===================================================================
--- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingInitialContextFactoryBuilder.java (rev 0)
+++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingInitialContextFactoryBuilder.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -0,0 +1,249 @@
+/*
+ * $Id$
+ */
+
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package org.richfaces.test.staging;
+
+import java.util.Hashtable;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.InitialContextFactoryBuilder;
+
+/**
+ * <p class="changed_added_2_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class StagingInitialContextFactoryBuilder implements
+ InitialContextFactoryBuilder {
+
+ private static final class StagingInitialContext implements Context {
+ public Object addToEnvironment(String propName,
+ Object propVal) throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void bind(Name name, Object obj)
+ throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void bind(String name, Object obj)
+ throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void close() throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Name composeName(Name name, Name prefix)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String composeName(String name, String prefix)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Context createSubcontext(Name name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Context createSubcontext(String name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void destroySubcontext(Name name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void destroySubcontext(String name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Hashtable<?, ?> getEnvironment()
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public NameParser getNameParser(Name name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public NameParser getNameParser(String name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object lookup(String name) throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object lookupLink(Name name) throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object lookupLink(String name)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void rebind(Name name, Object obj)
+ throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void rebind(String name, Object obj)
+ throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Object removeFromEnvironment(String propName)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void rename(Name oldName, Name newName)
+ throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void rename(String oldName, String newName)
+ throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void unbind(Name name) throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void unbind(String name) throws NamingException {
+ // TODO Auto-generated method stub
+
+ }
+ }
+
+ public static final class StagingInitialContextFactory implements
+ InitialContextFactory {
+ public Context getInitialContext(Hashtable<?, ?> environment)
+ throws NamingException {
+ // TODO Auto-generated method stub
+ return new StagingInitialContext();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see javax.naming.spi.InitialContextFactoryBuilder#createInitialContextFactory(java.util.Hashtable)
+ */
+ public InitialContextFactory createInitialContextFactory(
+ Hashtable<?, ?> environment) throws NamingException {
+ return new StagingInitialContextFactory();
+ }
+
+}
Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java
===================================================================
--- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServer.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -20,6 +20,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import javax.naming.NamingException;
+import javax.naming.spi.NamingManager;
import javax.servlet.Filter;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
@@ -450,6 +452,9 @@
if (!directory.isDirectory()) {
directory = directory.getParentFile();
}
+ if(!directory.exists()){
+ throw new TestException("directory does not exist:"+directory.getAbsolutePath());
+ }
try {
addFiles(baseDirectory, directory);
} catch (MalformedURLException e) {
@@ -473,15 +478,11 @@
if (!file.isDirectory()) {
file = file.getParentFile();
}
- if(file.exists()){
try {
addFiles(baseDirectory, file);
} catch (MalformedURLException e) {
throw new TestException(e);
}
- } else {
- throw new TestException("Base webapp directory ["+file.getPath()+"] does not exist");
- }
}
/**
@@ -535,13 +536,15 @@
throws MalformedURLException {
File[] files = file.listFiles();
for (File subfile : files) {
- ServerResourcePath serverResourcePath = new ServerResourcePath("/"
- + subfile.getName());
if (subfile.isDirectory()) {
+ ServerResourcePath serverResourcePath = new ServerResourcePath("/"
+ + subfile.getName()+"/");
ServerResourcesDirectory subDir = new ServerResourcesDirectory();
baseDirectory.addResource(serverResourcePath, subDir);
addFiles(subDir, subfile);
} else {
+ ServerResourcePath serverResourcePath = new ServerResourcePath("/"
+ + subfile.getName());
UrlServerResource resource = new UrlServerResource(subfile
.toURL());
baseDirectory.addResource(serverResourcePath, resource);
@@ -753,6 +756,13 @@
} catch (ServletException e) {
throw new TestException("Servlet initialisation error ", e);
}
+ try {
+ NamingManager.setInitialContextFactoryBuilder(new StagingInitialContextFactoryBuilder());
+ } catch (NamingException e) {
+ log.warning("Error set initial context factory builder.");
+ } catch (IllegalStateException e) {
+ log.warning("Initial context factory builder already set.");
+ }
this.initialised = true;
}
Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java
===================================================================
--- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -10,6 +10,7 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -175,11 +176,18 @@
*/
@SuppressWarnings("unchecked")
public Set getResourcePaths(String path) {
+ HashSet result=null;
ServerResource resource = getServerResource(path);
if(null != resource){
- return resource.getPaths();
+ Set<String> paths = resource.getPaths();
+ if(null != paths && paths.size()>0){
+ result = new HashSet(paths.size());
+ for (String resourcePath : paths) {
+ result.add(path+resourcePath);
+ }
+ }
}
- return null;
+ return result;
}
/* (non-Javadoc)
Modified: trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourcePathTest.java
===================================================================
--- trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourcePathTest.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/framework/jsf-test/src/test/java/org/richfaces/test/staging/ServerResourcePathTest.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -35,8 +35,8 @@
assertNotNull(path.getNextPath());
assertNotNull(path.getNextElementName());
assertFalse(path.isFile());
- assertEquals("WEB-INF", path.getNextElementName());
- assertEquals("/WEB-INF", path.toString());
+ assertEquals("WEB-INF/", path.getNextElementName());
+ assertEquals("/WEB-INF/", path.toString());
path = path.getNextPath();
assertNotNull(path);
assertTrue(path.isFile());
@@ -53,8 +53,8 @@
assertNotNull(path.getNextPath());
assertNotNull(path.getNextElementName());
assertFalse(path.isFile());
- assertEquals("WEB-INF", path.getNextElementName());
- assertEquals("/WEB-INF", path.toString());
+ assertEquals("WEB-INF/", path.getNextElementName());
+ assertEquals("/WEB-INF/", path.toString());
path = path.getNextPath();
assertNotNull(path);
assertTrue(path.isFile());
@@ -70,7 +70,7 @@
public void testWebXmlPath() {
ServerResourcePath path = ServerResourcePath.WEB_XML;
assertFalse(path.isFile());
- assertEquals("WEB-INF", path.getNextElementName());
+ assertEquals("WEB-INF/", path.getNextElementName());
assertEquals("/WEB-INF/web.xml", path.toString());
path = path.getNextPath();
assertNotNull(path.getNextElementName());
Modified: trunk/framework/test/src/test/java/org/richfaces/skin/SkinTestCase.java
===================================================================
--- trunk/framework/test/src/test/java/org/richfaces/skin/SkinTestCase.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/framework/test/src/test/java/org/richfaces/skin/SkinTestCase.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -219,16 +219,6 @@
assertFalse( hash==skin.hashCode(facesContext) );
}
- /*
- * Test method for 'org.richfaces.skin.SkinFactory.getDefaultProperties()'
- */
- public void testGetDefaultProperties() {
- SkinFactoryImpl factory = (SkinFactoryImpl) SkinFactory.getInstance();
- Properties defaultProps = factory.getDefaultSkinProperties();
- // assertEquals("HTML_BASIC",defaultProps.getProperty("render.kit"));
- // Second default config
- assertEquals("default",defaultProps.getProperty("a"));
- }
/*
* Test method for 'org.richfaces.skin.SkinFactory.getSkinName(FacesContext)'
@@ -236,5 +226,12 @@
public void testGetSkinName() {
}
+
+ public void testGetTheme() throws Exception {
+ SkinFactory factory = SkinFactory.getInstance();
+ Theme theme = factory.getTheme(facesContext, "test");
+ assertNotNull(theme);
+ assertEquals("foo", theme.getRendererType());
+ }
}
Added: trunk/framework/test/src/test/resources/META-INF/themes/test.theme.properties
===================================================================
--- trunk/framework/test/src/test/resources/META-INF/themes/test.theme.properties (rev 0)
+++ trunk/framework/test/src/test/resources/META-INF/themes/test.theme.properties 2009-03-04 01:25:32 UTC (rev 12816)
@@ -0,0 +1 @@
+rendererType=foo
Property changes on: trunk/framework/test/src/test/resources/META-INF/themes/test.theme.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/sandbox/ui/layout/src/main/config/component/page.xml
===================================================================
--- trunk/sandbox/ui/layout/src/main/config/component/page.xml 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/sandbox/ui/layout/src/main/config/component/page.xml 2009-03-04 01:25:32 UTC (rev 12816)
@@ -11,6 +11,22 @@
<![CDATA[
]]>
</description>
+ <facet>
+ <name>pageHeader</name>
+ <description><![CDATA[ ]]></description>
+ </facet>
+ <facet>
+ <name>header</name>
+ <description><![CDATA[ ]]></description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description><![CDATA[ ]]></description>
+ </facet>
+ <facet>
+ <name>sidebar</name>
+ <description><![CDATA[ ]]></description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.PageRenderer</name>
<template>org/richfaces/htmlPage.jspx</template>
@@ -58,6 +74,11 @@
</description>
</property>
<property>
+ <name>theme</name>
+ <classname>java.lang.String</classname>
+ <description><![CDATA[ ]]></description>
+ </property>
+ <property>
<name>contentType</name>
<classname>java.lang.String</classname>
<description>
Modified: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
===================================================================
--- trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-03-03 23:53:46 UTC (rev 12815)
+++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-03-04 01:25:32 UTC (rev 12816)
@@ -114,7 +114,7 @@
public String documentClass(FacesContext context, UIComponent component) {
//TODO - calculate class.
- return "ui-t3";
+ return "yui-t3";
}
public boolean hasFacet(UIComponent component, String facet){
15 years, 10 months
- 1
- 0