JBoss Rich Faces SVN: r13914 - trunk/examples/photoalbum/source/web/src/main/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-29 11:12:51 -0400 (Wed, 29 Apr 2009)
New Revision: 13914
Modified:
trunk/examples/photoalbum/source/web/src/main/resources/messages_en.properties
Log:
Fix RF 6964
Modified: trunk/examples/photoalbum/source/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/resources/messages_en.properties 2009-04-29 15:11:06 UTC (rev 13913)
+++ trunk/examples/photoalbum/source/web/src/main/resources/messages_en.properties 2009-04-29 15:12:51 UTC (rev 13914)
@@ -215,7 +215,7 @@
author=Author
close=Close
myAlbumShelfs=My album shelves
-newPhotos=New photos
+newPhotos=New images
created.shelf=Created
created.album=Created
created.image=Captured
@@ -236,7 +236,7 @@
photo_upload_progress=Image upload progress:
photos_was_uploaded_to=images was uploaded to
photo_upload_complete=Image upload complete:
-comments_for_this_photo_is_not_allowed=Comments for this photo is not allowed
+comments_for_this_photo_is_not_allowed=Comments for this image is not allowed
photo_name=Image name
upload_date=Upload date
show_meta_information=Show meta information
@@ -262,7 +262,7 @@
all_new_images=All new images
in_album=in album
-public_shelves=Public Shelves
+public_shelves=Pre-defined Shelves
all_images=All images
related_to_tag=related to tag
my_all_albums=My all albums
15 years
JBoss Rich Faces SVN: r13913 - trunk/examples/photoalbum/source/web/src/main/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-29 11:11:06 -0400 (Wed, 29 Apr 2009)
New Revision: 13913
Modified:
trunk/examples/photoalbum/source/web/src/main/resources/messages_en.properties
Log:
Fix RF 6965
Modified: trunk/examples/photoalbum/source/web/src/main/resources/messages_en.properties
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/resources/messages_en.properties 2009-04-29 15:10:42 UTC (rev 13912)
+++ trunk/examples/photoalbum/source/web/src/main/resources/messages_en.properties 2009-04-29 15:11:06 UTC (rev 13913)
@@ -266,7 +266,7 @@
all_images=All images
related_to_tag=related to tag
my_all_albums=My all albums
-my_all_photos=My all photos
+my_all_photos=My all images
ok=Ok
all_shared_albums=All shared albums
of_user=of user
15 years
JBoss Rich Faces SVN: r13912 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-29 11:10:42 -0400 (Wed, 29 Apr 2009)
New Revision: 13912
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
https://jira.jboss.org/jira/browse/RF-6863
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 2009-04-29 14:57:36 UTC (rev 13911)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-04-29 15:10:42 UTC (rev 13912)
@@ -876,7 +876,8 @@
}
- @Test
+ @Test(groups=FAILURES_GROUP)
+ //https://jira.jboss.org/jira/browse/RF-5209
public void testListenersInAjaxMode(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -895,7 +896,8 @@
}
- @Test
+ @Test(groups=FAILURES_GROUP)
+ //https://jira.jboss.org/jira/browse/RF-5209
public void testListenersInClientMode(Template template) {
renderPage(template, RESET_METHOD);
initIds(getParentId());
@@ -1135,19 +1137,22 @@
public void testDatePatternPopupMode(Template template) {
renderPage(template, RESET_METHOD2);
initIds(getParentId());
+ showPopup();
+
String originalPattern = "MM/dd/yyyy HH:mm";
writeStatus("Check 'datePattern' attribute in popup mode");
String selectedDate = "03/03/2007 11:00";
- String expectedSelectedDate = "03/2007";
- String expectedPattern = "MM/yyyy";
+ String expectedSelectedDate = "03-03-2007";
+ String expectedPattern = "dd-MM-yyyy";
setValueById(selectedDateId, selectedDate);
setValueById(currentDateId, "");
setValueById(datePatternId, expectedPattern);
setup();
-
+ showPopup();
+
try {
writeStatus("Check calendar popup is shown up and date in the input field is in proper format");
AssertValueEquals(calendarId + "InputDate", expectedSelectedDate, "Calendar input field shows wrong date");
@@ -1474,6 +1479,7 @@
public void testBoundaryDatesMode(Template template) {
renderPage(TODAY_CONTROL_AND_BOUNDARY_DATES_MODES_TEST_URL, template, RESET_METHOD2);
initIds(getParentId());
+ showPopup();
String selectedDateId = getParentId() + FORM_ID + "selectedDate";
String currentDateId = getParentId() + FORM_ID + "currentDate";
@@ -1491,6 +1497,7 @@
writeStatus("Check 'inactive' (default) mode");
selenium.select(boundaryDatesModeId, "inactive");
+ showPopup();
String expectedSelectedDate = selenium.getValue(inputDateId);
String expectedCurrentDate = selenium.getText(currentDateHeaderXpath);
@@ -1510,6 +1517,7 @@
writeStatus("Check 'scroll' mode");
selenium.select(boundaryDatesModeId, "scroll");
+ showPopup();
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);
@@ -1529,6 +1537,7 @@
writeStatus("Check 'select' mode");
selenium.select(boundaryDatesModeId, "select");
+ showPopup();
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);
15 years
JBoss Rich Faces SVN: r13911 - in trunk/examples/photoalbum/source/web/src/main: java/org/richfaces/photoalbum/ui and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-29 10:57:36 -0400 (Wed, 29 Apr 2009)
New Revision: 13911
Modified:
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/ui/ImageLoader.java
trunk/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/avatar.xhtml
Log:
Fix RF 6933
Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-04-29 14:10:56 UTC (rev 13910)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-04-29 14:57:36 UTC (rev 13911)
@@ -119,6 +119,7 @@
FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
if(fileManager == null || !fileManager.saveAvatar(avatarData, user)){
Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.AVATAR_SAVING_ERROR);
+ return;
}
}
try{
Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java 2009-04-29 14:10:56 UTC (rev 13910)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java 2009-04-29 14:57:36 UTC (rev 13911)
@@ -120,8 +120,9 @@
}
public boolean saveAvatar(File avatarData, User user) {
- return writeFile(user.getPath() +
- Constants.AVATAR_JPG, avatarData.getPath(), "", Constants.AVATAR_SIZE, true);
+ String avatarPath = File.separator + user.getLogin() + File.separator + Constants.AVATAR_JPG;
+ createDirectoryIfNotExist(avatarPath);
+ return writeFile(avatarPath, avatarData.getPath(), "", Constants.AVATAR_SIZE, true);
}
@Restrict("#{s:hasRole('admin')}")
@@ -237,7 +238,7 @@
}
private void createDirectoryIfNotExist(String fileNameNew) {
- final int lastIndexOf = fileNameNew.lastIndexOf(Constants.SLASH);
+ final int lastIndexOf = fileNameNew.lastIndexOf(File.separator);
if (lastIndexOf > 0) {
final String directory = fileNameNew.substring(0, lastIndexOf);
final File file = getFileByPath(directory);
Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/ui/ImageLoader.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/ui/ImageLoader.java 2009-04-29 14:10:56 UTC (rev 13910)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/ui/ImageLoader.java 2009-04-29 14:57:36 UTC (rev 13911)
@@ -31,6 +31,8 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.contexts.Contexts;
+import org.richfaces.photoalbum.domain.User;
import org.richfaces.photoalbum.manager.FileManager;
import org.richfaces.photoalbum.service.Constants;
@@ -53,10 +55,13 @@
public void paintAvatarImage(OutputStream out, Object data) throws IOException {
if (null == data) {
- return;
- }
- File imageResource = fileManager.getFileByAbsolutePath(data.toString());
- paintImageToBrowser(out, imageResource);
+ return;
+ }
+ File imageResource = fileManager.getFileByPath(data.toString());
+ if (imageResource == null || !imageResource.exists()) {
+ imageResource = fileManager.getFileByAbsolutePath(data.toString());
+ }
+ paintImageToBrowser(out, imageResource);
}
private void paintImageToBrowser(OutputStream out, File imageResource) throws IOException {
Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/userPrefs/avatar.xhtml
===================================================================
(Binary files differ)
15 years
JBoss Rich Faces SVN: r13910 - trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-29 10:10:56 -0400 (Wed, 29 Apr 2009)
New Revision: 13910
Modified:
trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java
Log:
Fix RF 6933
Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java
===================================================================
--- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java 2009-04-29 14:10:50 UTC (rev 13909)
+++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/service/Constants.java 2009-04-29 14:10:56 UTC (rev 13910)
@@ -53,7 +53,7 @@
public static final String USER_DELETED_EVENT = "userDeletedEvent";
//Errors(Internationalization pending)
- public static final String FILE_MANAGER_COMPONENT = "fileManager";
+ public static final String AVATAR_SAVING_ERROR = "Error while saving avatar to disk";
public static final String YOU_CAN_T_ADD_IMAGES_TO_THAT_ALBUM_ERROR = "You can't add images to that album";
public static final String SHELF_RECENTLY_DELETED_ERROR = "This shelf was recently deleted. Refresh your browser to see actual data.";
public static final String IMAGE_RECENTLY_DELETED_ERROR = "This image was recently deleted. Refresh your browser to see actual data.";
@@ -94,6 +94,8 @@
public static final String INDEX_OUTCOME = "index";
//Context-variables
+ public static final String FILE_MANAGER_COMPONENT = "fileManager";
+ public static final String AVATAR_DATA_COMPONENT = "avatarData";
public static final String ALBUM_VARIABLE = "album";
public static final String SHELF_VARIABLE = "shelf";
public static final String USER_VARIABLE = "user";
15 years
JBoss Rich Faces SVN: r13909 - in trunk/examples/photoalbum/source/web/src/main: webapp/includes/index and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-29 10:10:50 -0400 (Wed, 29 Apr 2009)
New Revision: 13909
Modified:
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java
trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/UserManager.java
trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/tree.xhtml
Log:
Fix RF 6933
Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-04-29 13:43:25 UTC (rev 13908)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Authenticator.java 2009-04-29 14:10:50 UTC (rev 13909)
@@ -20,6 +20,7 @@
*/
package org.richfaces.photoalbum.manager;
+import java.io.File;
import java.io.Serializable;
import java.security.MessageDigest;
@@ -112,6 +113,14 @@
}
user.setPasswordHash(hash(user.getPassword()));
user.setPreDefined(false);
+ File avatarData = (File)Contexts.getConversationContext().get(Constants.AVATAR_DATA_COMPONENT);
+ if(avatarData != null){
+ user.setHasAvatar(true);
+ FileManager fileManager = (FileManager)Contexts.getApplicationContext().get(Constants.FILE_MANAGER_COMPONENT);
+ if(fileManager == null || !fileManager.saveAvatar(avatarData, user)){
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.AVATAR_SAVING_ERROR);
+ }
+ }
try{
userAction.register(user);
}
@@ -126,7 +135,7 @@
public void goToRegister(){
Contexts.getSessionContext().set("user", new User());
- Contexts.getConversationContext().set("avatarData", null);
+ Contexts.getConversationContext().set(Constants.AVATAR_DATA_COMPONENT, null);
setLoginFailed(false);
Events.instance().raiseEvent(Constants.START_REGISTER_EVENT);
}
Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java 2009-04-29 13:43:25 UTC (rev 13908)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java 2009-04-29 14:10:50 UTC (rev 13909)
@@ -236,7 +236,7 @@
public void showUser(User user){
model.resetModel(NavigationEnum.USER_PREFS, user, null, null, null, null);
- Contexts.getConversationContext().set("avatarData", null);
+ Contexts.getConversationContext().set(Constants.AVATAR_DATA_COMPONENT, null);
}
public void showUnvisitedImages(Shelf shelf){
Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java 2009-04-29 13:43:25 UTC (rev 13908)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/FileManager.java 2009-04-29 14:10:50 UTC (rev 13909)
@@ -119,10 +119,9 @@
FileUtils.addDirectory(directory);
}
- @Restrict("#{s:hasRole('admin')}")
- public boolean saveAvatar(String path, User user) {
+ public boolean saveAvatar(File avatarData, User user) {
return writeFile(user.getPath() +
- Constants.AVATAR_JPG, path, "", Constants.AVATAR_SIZE, true);
+ Constants.AVATAR_JPG, avatarData.getPath(), "", Constants.AVATAR_SIZE, true);
}
@Restrict("#{s:hasRole('admin')}")
Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/UserManager.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/UserManager.java 2009-04-29 13:43:25 UTC (rev 13908)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/UserManager.java 2009-04-29 14:10:50 UTC (rev 13909)
@@ -53,7 +53,7 @@
@Observer(Constants.EDIT_USER_EVENT)
public void editUser(){
if (avatarData != null) {
- if(!fileManager.saveAvatar(avatarData.getPath(), user)){
+ if(!fileManager.saveAvatar(avatarData, user)){
Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, Constants.FILE_IO_ERROR);
return;
}
Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/tree.xhtml
===================================================================
(Binary files differ)
15 years
JBoss Rich Faces SVN: r13908 - trunk/docs.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-04-29 09:43:25 -0400 (Wed, 29 Apr 2009)
New Revision: 13908
Modified:
trunk/docs/release.sh
Log:
release.sh was updated
Modified: trunk/docs/release.sh
===================================================================
--- trunk/docs/release.sh 2009-04-29 13:38:19 UTC (rev 13907)
+++ trunk/docs/release.sh 2009-04-29 13:43:25 UTC (rev 13908)
@@ -40,6 +40,9 @@
[6]="SRC=$TRUNK/ui/assembly/target/docs/userguide/en/html TARGET=$FREEZONE/devguide/en/html"
[7]="SRC=$TRUNK/ui/assembly/target/docs/userguide/en/html_single TARGET=$FREEZONE/devguide/en/html_single"
[8]="SRC=$TRUNK/ui/assembly/target/docs/userguide/en/pdf TARGET=$FREEZONE/devguide/en/pdf"
+ [9]="SRC=$TRUNK/ui/assembly/target/docs/realworld/en/pdf TARGET=$FREEZONE/realworld/en/pdf"
+ [10]="SRC=$TRUNK/ui/assembly/target/docs/realworld/en/html TARGET=$FREEZONE/realworld/en/html"
+ [11]="SRC=$TRUNK/ui/assembly/target/docs/realworld/en/html_single TARGET=$FREEZONE/realworld/en/html_single"
)
##############################################################################################################
15 years
JBoss Rich Faces SVN: r13907 - trunk/examples/photoalbum/source/web/src/main/webapp/includes/index.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-29 09:38:19 -0400 (Wed, 29 Apr 2009)
New Revision: 13907
Modified:
trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/login.xhtml
Log:
Fix 6961
Modified: trunk/examples/photoalbum/source/web/src/main/webapp/includes/index/login.xhtml
===================================================================
(Binary files differ)
15 years
JBoss Rich Faces SVN: r13906 - trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-29 09:25:11 -0400 (Wed, 29 Apr 2009)
New Revision: 13906
Modified:
trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js
Log:
https://jira.jboss.org/jira/browse/RF-6948
Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js
===================================================================
--- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-04-29 13:10:27 UTC (rev 13905)
+++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-04-29 13:25:11 UTC (rev 13906)
@@ -122,7 +122,7 @@
this.patternDec.compile("[^0-9]+");
this.charMin = 65;
var o = this.options, self = this,
- tpl = $(" + div.rich-color-picker-wrapper", this.element);
+ tpl = $(" + .rich-color-picker-wrapper", this.element);
if (o.color.indexOf('hsb') > -1) {
this.color = this._fixColors(o.color, 'hsb');// this._fixHSB(this._fixColors(o.color, 'hsb'));
15 years
JBoss Rich Faces SVN: r13905 - trunk/framework/impl/src/main/java/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-04-29 09:10:27 -0400 (Wed, 29 Apr 2009)
New Revision: 13905
Modified:
trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java
Log:
RF-6934
Modified: trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-04-29 13:05:12 UTC (rev 13904)
+++ trunk/framework/impl/src/main/java/org/richfaces/VersionBean.java 2009-04-29 13:10:27 UTC (rev 13905)
@@ -72,7 +72,7 @@
}
public String getRevision() {
- return REVISION;
+ return REVISION;
}
/* (non-Javadoc)
* @see java.lang.Object#toString()
15 years