JBoss Rich Faces SVN: r11933 - trunk/test-applications/regressionArea.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-19 14:53:01 -0500 (Fri, 19 Dec 2008)
New Revision: 11933
Modified:
trunk/test-applications/regressionArea/pom.xml
Log:
Regression area pom updated
Modified: trunk/test-applications/regressionArea/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/pom.xml 2008-12-19 19:05:21 UTC (rev 11932)
+++ trunk/test-applications/regressionArea/pom.xml 2008-12-19 19:53:01 UTC (rev 11933)
@@ -63,9 +63,9 @@
<contextroot>regressionArea</contextroot>
<earname>regressionArea-ear</earname>
<richversion>3.3.0-SNAPSHOT</richversion>
- <seamversion>2.0.2.SP1</seamversion>
- <jsfversion>1.2_09</jsfversion>
- <jbosshome>C:/tmp/jboss-4.2.2.GA</jbosshome>
+ <seamversion>2.1.0.SP1</seamversion>
+ <jsfversion>1.2_10</jsfversion>
+ <jbosshome>C:/tmp/jboss-4.2.3.GA</jbosshome>
<jbosscontext>default</jbosscontext>
</properties>
@@ -96,6 +96,16 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </configuration>
+ </plugin>
</plugins>
17 years, 4 months
JBoss Rich Faces SVN: r11932 - trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-19 14:05:21 -0500 (Fri, 19 Dec 2008)
New Revision: 11932
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js
Log:
https://jira.jboss.org/jira/browse/RF-4383
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js 2008-12-19 18:27:59 UTC (rev 11931)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/skinning.js 2008-12-19 19:05:21 UTC (rev 11932)
@@ -1,7 +1,9 @@
{
var mediaName = "rich-extended-skinning";
- var skipNavigator = window.opera || navigator.userAgent.indexOf('AppleWebKit/') > -1;
+ var userAgent = navigator.userAgent;
+
+ var skipNavigator = window.opera || (userAgent.indexOf('AppleWebKit/') > -1 && userAgent.indexOf('Chrome/') == -1);
if (!skipNavigator) {
var resetMedia = function(elt) {
17 years, 4 months
JBoss Rich Faces SVN: r11931 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-19 13:27:59 -0500 (Fri, 19 Dec 2008)
New Revision: 11931
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle/listShuttleTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java
Log:
RF-5309
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle/listShuttleTest.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2008-12-19 18:16:00 UTC (rev 11930)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2008-12-19 18:27:59 UTC (rev 11931)
@@ -134,6 +134,29 @@
tagValidatorId = attrFormId + ":tagValidatorId";
}
+ /**
+ * Respective number of columns, header dimensions
+ */
+ @Test
+ public void testNumberOfColumnsAndHeaderDimensions(Template template) {
+ init(template);
+ _selectItem(parentId + "ls:0", true, false);
+ clickById(copyId);
+ clickAjaxCommandAndWait(submitId);
+ String tdXpath = "id('" + lsId +"tbody')/tr[1]/td";
+ String thXpath = "id('" + lsId +"internal_header_tab')/thead/tr/th";
+ Assert.assertEquals(selenium.getXpathCount(tdXpath).intValue(), 2);
+ for (int i = 1; i <= 2; i++) {
+ Assert.assertEquals(selenium.getElementWidth("xpath=" + tdXpath + "[" + i + "]").intValue(), selenium.getElementWidth("xpath=" + thXpath + "[" + i + "]").intValue());
+ }
+ tdXpath = "id('" + lsId +"tlTbody')/tr[1]/td";
+ thXpath = "id('" + lsId +"tlInternal_header_tab')/thead/tr/th";
+ Assert.assertEquals(selenium.getXpathCount(thXpath).intValue(), 2);
+ for (int i = 1; i <= 2; i++) {
+ Assert.assertEquals(selenium.getElementWidth("xpath=" + tdXpath + "[" + i + "]").intValue(), selenium.getElementWidth("xpath=" + thXpath + "[" + i + "]").intValue());
+ }
+ }
+
/**
* Check control facets
*/
17 years, 4 months
JBoss Rich Faces SVN: r11930 - trunk/ui/listShuttle/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-19 13:16:00 -0500 (Fri, 19 Dec 2008)
New Revision: 11930
Modified:
trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
Log:
ListShuttle: "required" attribute hidden
Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-12-19 18:14:34 UTC (rev 11929)
+++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-12-19 18:16:00 UTC (rev 11930)
@@ -69,6 +69,9 @@
<property hidden="true">
<name>value</name>
</property>
+ <property hidden="true">
+ <name>required</name>
+ </property>
<property elonly="true">
<name>sourceSelection</name>
17 years, 4 months
JBoss Rich Faces SVN: r11929 - in trunk/test-applications/realworld: ejb/src/main/java/org/richfaces/realworld/service and 8 other directories.
by richfaces-svn-commits＠lists.jboss.org
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;
+}
17 years, 4 months
JBoss Rich Faces SVN: r11928 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-12-19 12:33:48 -0500 (Fri, 19 Dec 2008)
New Revision: 11928
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/layoutTests.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5343 started
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/layoutTests.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-19 16:50:57 UTC (rev 11927)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-19 17:33:48 UTC (rev 11928)
@@ -432,7 +432,7 @@
Assert.fail("Calendar displays invalid date. It should contain ["+expected+"]. But was ["+headerDate+"]");
}
}
-
+
@Test
public void testEventsAttributes(Template template) {
renderPage(EVENTS_TEST_URL, template, RESET_METHOD);
@@ -1616,6 +1616,14 @@
}
@Test
+ public void testFacets(Template template) {
+ renderPage(LAYOUT_TESTS_URL, template, null);
+ initIds(getParentId());
+
+ writeStatus("Check facets of the component: 'header', 'footer', 'optionalHeader', 'optionalFooter', 'weekNumber' and 'weekDay'");
+ }
+
+ @Test
public void testResetTimeOnDateSelect(Template template) {
renderPage(RESET_TIME_ON_DATE_SELECTION_TEST_URL, template, null);
initIds(getParentId());
17 years, 4 months
JBoss Rich Faces SVN: r11927 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/calendar and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-12-19 11:50:57 -0500 (Fri, 19 Dec 2008)
New Revision: 11927
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/todayControlAndBoundaryDatesModesTest.xhtml
Removed:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/todayControlModeTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5349
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2008-12-19 16:40:54 UTC (rev 11926)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2008-12-19 16:50:57 UTC (rev 11927)
@@ -646,4 +646,22 @@
this.direction = direction;
}
+ private String boundaryDatesMode = "inactive";
+
+ /**
+ * Gets value of boundaryDatesMode field.
+ * @return value of boundaryDatesMode field
+ */
+ public String getBoundaryDatesMode() {
+ return boundaryDatesMode;
+ }
+
+ /**
+ * Set a new value for boundaryDatesMode field.
+ * @param boundaryDatesMode a new value for boundaryDatesMode field
+ */
+ public void setBoundaryDatesMode(String boundaryDatesMode) {
+ this.boundaryDatesMode = boundaryDatesMode;
+ }
+
}
Copied: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/todayControlAndBoundaryDatesModesTest.xhtml (from rev 11913, trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/todayControlModeTest.xhtml)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/todayControlModeTest.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-19 16:40:54 UTC (rev 11926)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-19 16:50:57 UTC (rev 11927)
@@ -59,7 +59,7 @@
static final String SHOW_ATTRIBURES_TEST_URL = "pages/calendar/showAttributesTest.xhtml";
- static final String TODAY_CONTROL_MODE_URL = "pages/calendar/todayControlModeTest.xhtml";
+ static final String TODAY_CONTROL_AND_BOUNDARY_DATES_MODES_TEST_URL = "pages/calendar/todayControlAndBoundaryDatesModesTest.xhtml";
static final String BUTTON_RELATED_TEST_URL = "pages/calendar/buttonRelatedAttributesTest.xhtml";
@@ -188,6 +188,8 @@
String enableManualInputId;
+ String boundaryDatesModeId;
+
void initIds(String parentId) {
calendarId = parentId + FORM_ID + "calendar";
calendarHeaderId = calendarId + "Header";
@@ -236,6 +238,7 @@
jointPointId = parentId + FORM_ID + "jointPoint";
directionId = parentId + FORM_ID + "direction";
enableManualInputId = parentId + FORM_ID + "enableManualInput";
+ boundaryDatesModeId = parentId + FORM_ID + "boundaryDatesMode";
}
String getStatus() {
@@ -1340,7 +1343,7 @@
@Test
public void testTodayControlMode(Template template) {
- renderPage(TODAY_CONTROL_MODE_URL, template, null);
+ renderPage(TODAY_CONTROL_AND_BOUNDARY_DATES_MODES_TEST_URL, template, null);
initIds(getParentId());
String datePattern = selenium.getText(getParentId() + FORM_ID + "datePattern");
@@ -1422,6 +1425,78 @@
}
@Test
+ public void testBoundaryDatesMode(Template template) {
+ renderPage(TODAY_CONTROL_AND_BOUNDARY_DATES_MODES_TEST_URL, template, null);
+ initIds(getParentId());
+ String selectedDateId = getParentId() + FORM_ID + "selectedDate";
+ String startDate = "02/21/2007 12:00";
+ String firstMarCellId = calendarId + "DayCell32";
+ String thirtyFirstJanCellId = calendarId + "DayCell3";
+ selenium.focus(selectedDateId);
+ setValueById(selectedDateId, startDate);
+ selenium.fireEvent(selectedDateId, "blur");
+
+ writeStatus("Check 'boundaryDatesMode' attribute");
+
+ writeStatus("Check 'inactive' (default) mode");
+ selenium.select(boundaryDatesModeId, "inactive");
+
+ String expectedSelectedDate = selenium.getValue(inputDateId);
+ String expectedCurrentDate = selenium.getText(currentDateHeaderXpath);
+
+ writeStatus("Click boundary cells. Nothing has to be changed");
+ clickById(firstMarCellId);
+ String actualSelectedDate = selenium.getValue(inputDateId);
+ String actualCurrentDate = selenium.getText(currentDateHeaderXpath);
+ Assert.assertEquals(actualCurrentDate, expectedCurrentDate, "Nothing has to be changed");
+ Assert.assertEquals(actualSelectedDate, expectedSelectedDate, "Nothing has to be changed");
+
+ clickById(thirtyFirstJanCellId);
+ actualSelectedDate = selenium.getValue(inputDateId);
+ actualCurrentDate = selenium.getText(currentDateHeaderXpath);
+ Assert.assertEquals(actualCurrentDate, expectedCurrentDate, "Nothing has to be changed");
+ Assert.assertEquals(actualSelectedDate, expectedSelectedDate, "Nothing has to be changed");
+
+ writeStatus("Check 'scroll' mode");
+ selenium.select(boundaryDatesModeId, "scroll");
+ writeStatus("Click a day from next month, the month has to be scrolled to the next month, but selected date stays untouched");
+ clickById(firstMarCellId);
+ actualSelectedDate = selenium.getValue(inputDateId);
+ actualCurrentDate = selenium.getText(currentDateHeaderXpath);
+ Assert.assertEquals(actualCurrentDate, "March, 2007", "Month has to be switched to the next one");
+ Assert.assertEquals(actualSelectedDate, expectedSelectedDate, "Selected date has not to be changed");
+ writeStatus("Move back");
+ selenium.click("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td[@class='rich-calendar-tool'][2]/div");
+ writeStatus("Click a day from previous month, the month has to be scrolled to the previous month, selected date stays untouched as before");
+ clickById(thirtyFirstJanCellId);
+ actualSelectedDate = selenium.getValue(inputDateId);
+ actualCurrentDate = selenium.getText(currentDateHeaderXpath);
+ Assert.assertEquals(actualCurrentDate, "January, 2007", "Month has to be switched to the previous one");
+ Assert.assertEquals(actualSelectedDate, expectedSelectedDate, "Selected date has not to be changed");
+ writeStatus("Move back");
+ selenium.click("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td[@class='rich-calendar-tool'][3]/div");
+
+ writeStatus("Check 'select' mode");
+ selenium.select(boundaryDatesModeId, "select");
+ writeStatus("Click a day from next month: 1) the month has to be scrolled to the next month 2) date set to selected date (1st of March)");
+ clickById(firstMarCellId);
+ actualSelectedDate = selenium.getValue(inputDateId);
+ actualCurrentDate = selenium.getText(currentDateHeaderXpath);
+ Assert.assertEquals(actualCurrentDate, "March, 2007", "Month has to be switched to the next one");
+ Assert.assertEquals(actualSelectedDate, "03/01/2007 12:00", "Selected date has to be changed");
+ writeStatus("Move back");
+ selenium.click("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td[@class='rich-calendar-tool'][2]/div");
+ writeStatus("Click a day from previous month: 1) the month has to be scrolled to the previous month 2) date set to selected date (31st of January)");
+ clickById(thirtyFirstJanCellId);
+ actualSelectedDate = selenium.getValue(inputDateId);
+ actualCurrentDate = selenium.getText(currentDateHeaderXpath);
+ Assert.assertEquals(actualCurrentDate, "January, 2007", "Month has to be switched to the previous one");
+ Assert.assertEquals(actualSelectedDate, "01/31/2007 12:00", "Selected date has to be changed");
+ writeStatus("Move back");
+ selenium.click("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td[@class='rich-calendar-tool'][3]/div");
+ }
+
+ @Test
public void testButtonRelatedAttributes(Template template) {
renderPage(BUTTON_RELATED_TEST_URL, template, null);
writeStatus("Check button-related attributes");
17 years, 4 months
JBoss Rich Faces SVN: r11926 - trunk/ui/scrollableDataTable/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-19 11:40:54 -0500 (Fri, 19 Dec 2008)
New Revision: 11926
Modified:
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
Log:
RF-4856
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2008-12-19 15:18:16 UTC (rev 11925)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2008-12-19 16:40:54 UTC (rev 11926)
@@ -25,9 +25,12 @@
<vcp:body/>
<jsp:scriptlet>
+ int offset = -3;
+ Object sepOffset = variables.getVariable("sepOffset");
+ if (sepOffset instanceof Integer) {
+ offset += ((Integer)sepOffset).intValue();
+ }
- int offset = ((Integer)variables.getVariable("sepOffset")).intValue() - 3;
-
</jsp:scriptlet>
<span column="#{cell_index}" id="#{client_id}:hsep_#{cell_index}" style="left: #{offset}px;" class="dr-sdt-hsep rich-sdt-hsep" />
</th>
17 years, 4 months
JBoss Rich Faces SVN: r11925 - in trunk/samples/richfaces-demo/src/main/webapp: richfaces/queue/examples/resources and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-12-19 10:18:16 -0500 (Fri, 19 Dec 2008)
New Revision: 11925
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/queue.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/resources/button2.gif
trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/resources/button3.gif
trunk/samples/richfaces-demo/src/main/webapp/scripts/queueUi.js
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/queue.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/queue.xhtml 2008-12-19 14:56:43 UTC (rev 11924)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/queue.xhtml 2008-12-19 15:18:16 UTC (rev 11925)
@@ -7,17 +7,22 @@
xmlns:c="http://java.sun.com/jstl/core">
<a4j:loadScript src="/scripts/queueUi.js"/>
<a4j:loadStyle src="/css/queueStylesheet.js"/>
+ <style>
+ .inner td{
+ border:none;
+ }
+ </style>
<h:form id="form1" prependId="false">
<a4j:queue requestDelay="1000" ignoreDupResponce="true"/>
- <h:panelGrid columns="1" cellspacing="5">
- <h:panelGrid id="board1" columns="6" border="1">
+ <h:panelGrid columns="1" cellpadding="0" cellspacing="3">
+ <h:panelGrid columns="6" cellpadding="3" cellspacing="0" border="1" bordercolor="#cccccc">
<f:facet name="header">
- <h:outputText value="Ajax Requests" styleClass="keytitle" />
+ <h:outputText value="Ajax Requests"/>
</f:facet>
<c:forEach begin="0" end="17" step="1" var="i">
- <h:panelGrid>
+ <h:panelGrid styleClass="inner">
<a4j:commandButton id="_#{i}" image="queue/examples/resources/button2.gif"
style="height:50px;width:50px;"
onclick="buttonpush('_#{i}');"
@@ -27,17 +32,21 @@
<h:outputText value="#{i}" style="font-weight:bold"/>
</h:panelGrid>
</h:panelGrid>
- </c:forEach>
+ </c:forEach>
</h:panelGrid>
- <h:panelGrid>
- <f:facet name="header">
- <h:outputText value="Request Queue" styleClass="keytitle" />
- </f:facet>
- <table id="queuetable" border="1">
- <tr id="tr1">
+ <table id="queuetable" cellpadding="3" cellspacing="0" border="1" bordercolor="#cccccc">
+ <thead>
+ <tr>
+ <th colspan="100">
+ Request Queue
+ </th>
</tr>
- </table>
- </h:panelGrid>
+ </thead>
+ <tbody>
+ <tr id="tr1">
+ </tr>
+ </tbody>
+ </table>
</h:panelGrid>
</h:form>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/resources/button2.gif
===================================================================
(Binary files differ)
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/queue/examples/resources/button3.gif
===================================================================
(Binary files differ)
Modified: trunk/samples/richfaces-demo/src/main/webapp/scripts/queueUi.js
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/scripts/queueUi.js 2008-12-19 14:56:43 UTC (rev 11924)
+++ trunk/samples/richfaces-demo/src/main/webapp/scripts/queueUi.js 2008-12-19 15:18:16 UTC (rev 11925)
@@ -30,7 +30,7 @@
cell.setAttribute("height", "50px");
cell.setAttribute("width", "50px");
cell.innerHTML = cellData.nodeValue + '(1)';
- cell.className = "queueCell";
+// cell.className = "queueCell";
}
function changeCounterInCell(cellData, counter){
var row = document.getElementById("tr1");
17 years, 4 months
JBoss Rich Faces SVN: r11924 - in trunk/test-applications/realworld/Upload/root: Football and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2008-12-19 09:56:43 -0500 (Fri, 19 Dec 2008)
New Revision: 11924
Added:
trunk/test-applications/realworld/Upload/root/Football/
trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer.jpg
trunk/test-applications/realworld/Upload/root/Football/Soccer.jpg
trunk/test-applications/realworld/Upload/root/Football/Soccer416x594.jpg
trunk/test-applications/realworld/Upload/root/Football/bdysch!!!.jpg
trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0.jpg
trunk/test-applications/realworld/Upload/root/Football/flag_football.jpg
Log:
Added: trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/Basketball_soccer.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/realworld/Upload/root/Football/Soccer.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/Soccer.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/realworld/Upload/root/Football/Soccer416x594.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/Soccer416x594.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/realworld/Upload/root/Football/bdysch!!!.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/bdysch!!!.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/euro2008_holland_wideweb__470x321,0.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/realworld/Upload/root/Football/flag_football.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/Upload/root/Football/flag_football.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 4 months