[richfaces-svn-commits] JBoss Rich Faces SVN: r11929 - in trunk/test-applications/realworld: ejb/src/main/java/org/richfaces/realworld/service and 8 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Dec 19 13:14:34 EST 2008
Author: amarkhel
Date: 2008-12-19 13:14:34 -0500 (Fri, 19 Dec 2008)
New Revision: 11929
Modified:
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java
trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchBean.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageHelper.java
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java
trunk/test-applications/realworld/web/src/main/resources/messages_en.properties
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
trunk/test-applications/realworld/web/src/main/webapp/error.xhtml
trunk/test-applications/realworld/web/src/main/webapp/fileUpload.xhtml
trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld.css
Log:
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -67,16 +67,6 @@
@NotEmpty
@Length(min=3)
private String description;
-
- /*@OneToMany(mappedBy = "parent", cascade = { CascadeType.ALL }, fetch = FetchType.LAZY)
- @org.hibernate.annotations.LazyCollection(org.hibernate.annotations.LazyCollectionOption.EXTRA)
- @org.hibernate.annotations.OrderBy(clause = "NAME asc")
- private List<Album> childAlbums = new ArrayList<Album>();
-
- @ManyToOne(cascade = CascadeType.ALL,fetch = FetchType.LAZY)
- @JoinColumn(name = "PARENT_ID", nullable = true)
- @org.hibernate.annotations.ForeignKey(name = "FK_PARENT_ID")
- private Album parent;*/
@ManyToOne
@JoinColumn(name="ALBUM_USER_ID",
@@ -157,31 +147,6 @@
}
/**
- * Getter for property childAlbums
- *
- * @return list of childs of current albums
- *//*
- public List<Album> getChildAlbums() {
- return childAlbums;
- }
-
- *//**
- * Getter for property parent
- *
- * @return parent of album
- *//*
- public Album getParent() {
- return parent;
- }
-
- *//**
- * Setter for property parent
- *//*
- private void setParent(Album parent) {
- this.parent = parent;
- }*/
-
- /**
* Getter for property description
*
* @return description of album
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -73,11 +73,6 @@
@JoinColumn(name="RANK_ID")
private Rank rank;
-/* @org.hibernate.annotations.CollectionOfElements(targetElement = java.lang.String.class)
- @JoinTable(name = "IMAGE_TAGS", joinColumns = @JoinColumn(name = "IMAGE_ID"))
- @Column(name = "TAG", nullable = false)
- private Set<String> tags = new HashSet<String>();*/
-
@Column(length = 1024)
@NotNull
@NotEmpty
@@ -98,6 +93,9 @@
@org.hibernate.annotations.OrderBy(clause = "tag asc")
private List<MetaTag> tags = new ArrayList<MetaTag>();
+ @Transient
+ private List<MetaTag> meta = new ArrayList<MetaTag>();
+
@OneToMany(mappedBy = "image", cascade = { CascadeType.ALL }, fetch = FetchType.LAZY)
@org.hibernate.annotations.LazyCollection(org.hibernate.annotations.LazyCollectionOption.EXTRA)
@org.hibernate.annotations.OrderBy(clause="date asc")
@@ -203,14 +201,6 @@
public void setCreated(Date created) {
this.created = created;
}
-
- /*public Set<String> getTags() {
- return tags;
- }
-
- public void setTags(Set<String> tags) {
- this.tags = tags;
- }*/
public Album getAlbum() {
return album;
@@ -294,4 +284,12 @@
public void setRank(Rank rank) {
this.rank = rank;
}
+
+ public List<MetaTag> getMeta() {
+ return meta;
+ }
+
+ public void setMeta(List<MetaTag> meta) {
+ this.meta = meta;
+ }
}
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -15,7 +15,7 @@
@Name("albumAction")
public class AlbumAction implements IAlbumAction {
- //@PersistenceContext(unitName = "entityManager", type=PersistenceContextType.EXTENDED)
+
@In(value="entityManager")
EntityManager em;
@@ -40,7 +40,6 @@
}
public void editAlbum(Album album){
- em.merge(album);
em.flush();
}
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -17,7 +17,7 @@
@Name("imageAction")
public class ImageAction implements IImageAction {
- //@PersistenceContext(unitName = "entityManager", type=PersistenceContextType.EXTENDED)
+
@In(value="entityManager")
EntityManager em;
@@ -52,7 +52,6 @@
}
public void editImage(Image image, boolean parentChanged) {
- image = em.merge(image);
if(parentChanged){
Album albumPrevious = image.getAlbum();
String login = albumPrevious.getOwner().getLogin();
@@ -61,12 +60,16 @@
Album album = (Album)em.createQuery("from Album a where a.name=:albumName and a.owner.login=:login").setParameter("albumName", albumName).setParameter("login", login).getSingleResult();
album.addImage(image);
}
+ image.getTags().clear();
+ image.setTags(image.getMeta());
em.flush();
}
public void addImage(Image image) {
em.persist(image);
image.getAlbum().addImage(image);
+ image.getTags().clear();
+ image.setTags(image.getMeta());
em.flush();
}
@@ -81,12 +84,10 @@
}
public void editComment(Comment comment) {
- em.merge(comment);
em.flush();
}
public void vote(Image image, Long value) {
- image = em.merge(image);
Long total = image.getRank().getTotal();
Long votes = image.getRank().getHits();
total += value;
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/SearchService.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -21,18 +21,13 @@
public class SearchService implements ISearchService, Serializable
{
- /**
- *
- */
private static final long serialVersionUID = -2750591521413940277L;
- //@PersistenceContext(unitName = "entityManager", type=PersistenceContextType.EXTENDED)
@In(value="entityManager")
EntityManager em;
/* (non-Javadoc)
* @see org.richfaces.realworld.service.ISearchService#searchImages(java.lang.String)
*/
- @Begin(join=true)
public List<Image> searchImages(String searchPattern, String additionalParams, Map<String, Object> paramMap){
String fullQuery = "select i from MetaTag t join t.parent i where t.tag like:metatag and i.album.shared=true" + additionalParams + " order by i.rank.total/i.rank.hits desc";
Query prepared = em.createQuery(fullQuery).setParameter("metatag", searchPattern+"%");
@@ -45,6 +40,7 @@
if(paramMap != null && paramMap.get(":date") != null){
prepared.setParameter("date", paramMap.get(":date"));
}
+ prepared.setMaxResults(20);
List<Image> images = prepared.getResultList();
for(Image image:images){
image.getAlbum().getOwner().getLogin();
@@ -52,7 +48,6 @@
return images;
}
- @Begin(join=true)
public List<Image> popularImages(String additionalParams, Map<String, Object> paramMap){
String fullQuery = "select i from Image i join i.rank r where i.album.shared=true" + additionalParams + " order by r.total/r.hits desc";
Query prepared = em.createQuery(fullQuery);
@@ -65,6 +60,7 @@
if(paramMap != null && paramMap.get(":date") != null){
prepared.setParameter("date", paramMap.get(":date"));
}
+ prepared.setMaxResults(20);
List<Image> images = prepared.getResultList();
for(Image image:images){
image.getAlbum().getOwner().getLogin();
@@ -72,7 +68,6 @@
return images;
}
- @Begin(join=true)
public List<Image> worstImages(String additionalParams, Map<String, Object> paramMap){
String fullQuery = "select i from Image i join i.rank r where i.album.shared=true" + additionalParams + " order by r.total/r.hits asc";
Query prepared = em.createQuery(fullQuery);
@@ -85,6 +80,7 @@
if(paramMap != null && paramMap.get(":date") != null){
prepared.setParameter("date", paramMap.get(":date"));
}
+ prepared.setMaxResults(20);
List<Image> images = prepared.getResultList();
for(Image image:images){
image.getAlbum().getOwner().getLogin();
Modified: trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
===================================================================
--- trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -28,7 +28,6 @@
@Name("userAction")
public class UserAction implements IUserAction {
- //@PersistenceContext(unitName = "entityManager", type=PersistenceContextType.EXTENDED)
@In(value="entityManager")
EntityManager em;
@@ -57,7 +56,6 @@
}
public void updateUser(User user) {
- //em.merge(user);
em.flush();
this.user = user;
}
@@ -69,14 +67,9 @@
}
public boolean isUserExist(String login) {
- try{
- User tempuser = (User)em.createQuery("from User u where u.login = :login")
+ return em.createQuery("from User u where u.login = :login")
.setParameter("login", login)
- .getSingleResult();
- }catch(Exception e){
- return false;
- }
- return true;
+ .getResultList().size() == 0;
}
public List<String> getUsers(String suggest) {
@@ -103,16 +96,17 @@
friend.removeFriendshipRequest(request);
user.addFriend(friend);
friend.addFriend(user);
+ //em.flush();
}
public void removeFromSharedAlbums(User user, Album album) {
user.removeFromSharedAlbums(album);
- em.flush();
+ //em.flush();
}
public void addSharedAlbum(Album album) {
user.addSharedAlbum(album);
-
+ em.flush();
}
public void loginAnonymous() {
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchBean.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchBean.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/SearchBean.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -122,7 +122,7 @@
additionalParams.append(getAstFromIndex(votesChoice));
additionalParams.append(":choice");
}
- if(dateChoice != null && dateChoice > 0L){
+ if(dateChoice != null && dateChoice > 0L && date != null){
additionalParams.append(" and i.created");
additionalParams.append(getAstFromIndex(dateChoice));
additionalParams.append(":date");
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/session/Authenticator.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -84,14 +84,6 @@
}
}
selectedUser = user;
- /*for(User u:user.getFriends()){
- for(Album a :u.getChildAlbums()){
- a.getImages().get(0);
- }
- }
- for(Album a:user.getSharedAlbums()){
- a.getImages().get(0);
- }*/
Events.instance().raiseEvent("updateMainArea", NavigationEnum.IMAGE_PREVIEW);
return true;
}
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageHelper.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageHelper.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -6,6 +6,7 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.component.UIRepeat;
+import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.Name;
import org.richfaces.component.html.HtmlInputText;
import org.richfaces.realworld.domain.Image;
@@ -59,7 +60,7 @@
MetaTag metaTag = new MetaTag();
metaTag.setTag(metaRef.getValue().toString());
metaTag.setParent(image);
- image.getTags().add(metaTag);
+ image.getMeta().add(metaTag);
return null;
}
@@ -67,12 +68,12 @@
MetaTag metaTag = new MetaTag();
metaTag.setTag("");
metaTag.setParent(image);
- image.getTags().add(metaTag);
+ image.getMeta().add(metaTag);
//image.getMeta().add("");
}
public void removeTag(MetaTag tag, Image image){
- image.getTags().remove(tag);
+ image.getMeta().remove(tag);
//image.getMeta().remove(tag);
}
}
Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ModalPanelHelper.java 2008-12-19 18:14:34 UTC (rev 11929)
@@ -1,6 +1,7 @@
package org.richfaces.realworld.util;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Date;
import javax.faces.event.ActionEvent;
@@ -16,6 +17,7 @@
import org.richfaces.realworld.domain.Comment;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.Message;
+import org.richfaces.realworld.domain.MetaTag;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.tree.TreeActionManager;
@@ -80,6 +82,7 @@
this.actionName = actionName;
if(null != image){
this.image = image;
+ image.setMeta(new ArrayList<MetaTag>(image.getTags()));
}else{
this.image = new Image();
}
Modified: trunk/test-applications/realworld/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/test-applications/realworld/web/src/main/resources/messages_en.properties 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/web/src/main/resources/messages_en.properties 2008-12-19 18:14:34 UTC (rev 11929)
@@ -88,3 +88,16 @@
javax.faces.validator.NOT_IN_RANGE=value must be between {0} and {1}
javax.faces.converter.STRING=value could not be converted to a string
+error=Error
+errorStub=Something bad happened :-(
+fileUpload.header=You will upload files in album: #{selectedAlbum.name}. If you want upload in another album, select it.
+fileUpload.uploadedPanelHeader=Uploaded Files Info
+fileUpload.fileNameLabel=File Name:
+fileUpload.fileLengthLabel=File Length(bytes):
+fileUpload.fileEditLabel=Edit
+fileUpload.storeAllLabel=Store All
+fileUpload.storeSelectedLabel=Store Selected
+fileUpload.clearLabel=Clear Uploaded Data
+fileUpload.clearSelectedLabel=Clear Selected
+
+image.panelHeader=Image Preview: Selected Album: #{selectedAlbum.name}
\ No newline at end of file
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/components.xml 2008-12-19 18:14:34 UTC (rev 11929)
@@ -22,7 +22,8 @@
<core:manager concurrent-request-timeout="20000"
conversation-timeout="120000"
- conversation-id-parameter="cid"/>
+ conversation-id-parameter="cid"
+ default-flush-mode="MANUAL"/>
<persistence:managed-persistence-context name="entityManager"
auto-create="true"
persistence-unit-jndi-name="java:/realWorldEntityManager"/>
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/imagePrefs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/error.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/fileUpload.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld.css
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld.css 2008-12-19 17:33:48 UTC (rev 11928)
+++ trunk/test-applications/realworld/web/src/main/webapp/stylesheet/realworld.css 2008-12-19 18:14:34 UTC (rev 11929)
@@ -125,4 +125,11 @@
.rich-stglpanel-body {
overflow: auto;
-}
+}
+.top {
+ vertical-align: top;
+}
+.info {
+ height: 202px;
+ overflow: auto;
+}
More information about the richfaces-svn-commits
mailing list