JBoss Rich Faces SVN: r13142 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-24 12:17:20 -0400 (Tue, 24 Mar 2009)
New Revision: 13142
Modified:
trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml
Log:
corrected a mistake
Modified: trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml 2009-03-24 16:16:44 UTC (rev 13141)
+++ trunk/docs/userguide/en/src/main/docbook/included/fileUpload.xml 2009-03-24 16:17:20 UTC (rev 13142)
@@ -80,12 +80,12 @@
</para>
- <para> There are two places where uploaded files are stored: </para>
+ <para> There are two places where the uploaded files are stored: </para>
<itemizedlist>
<listitem>
<para> In the temporary folder (depends on OS) if the value of the
<code>createTempFile</code> parameter in <property>Ajax4jsf
- Filter</property> section is "true" (by Default) </para>
+ Filter</property> (in web.xml) section is "true" (by Default) </para>
<programlisting role="XML"><![CDATA[...
<init-param>
<param-name>createTempFiles</param-name>
@@ -120,7 +120,7 @@
<programlisting role="XML"><![CDATA[...
<rich:fileUpload uploadData="#{bean.data}" fileUploadListener="#{bean.listener}"/>
...]]></programlisting>
- <para> The following methods of processing the uploaded files are: </para>
+ <para> The following methods for processing the uploaded files are available: </para>
<itemizedlist>
<listitem>
<para>
15 years, 9 months
JBoss Rich Faces SVN: r13141 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-03-24 12:16:44 -0400 (Tue, 24 Mar 2009)
New Revision: 13141
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
Log:
https://jira.jboss.org/jira/browse/RF-6468
corrected a description
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-03-24 16:01:41 UTC (rev 13140)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2009-03-24 16:16:44 UTC (rev 13141)
@@ -442,7 +442,7 @@
</listitem>
</itemizedlist>
<para>In this section we will take a closer look at the listed above types of the queue
- and see in more detail how they differ. Usage details are alos covered in the <link linkend="queue"><a4j:queue></link>chapter.</para>
+ and see in more detail how they differ. Usage details are covered in the <link linkend="queue"><a4j:queue></link> chapter.</para>
<section>
<title>Global default queue, defined in the web.xml file</title>
@@ -450,7 +450,7 @@
<itemizedlist>
<listitem><para>Only one global queue will ever exist on a view</para>
- <para>If you define more that one with this name while attempting to set its attributes a warning will appear in server console
+ <para>If you define more then one with this name while attempting to set its attributes a warning will appear in server console
during rendering. All the same named queues after the first instance are ignored.</para></listitem>
<listitem><para>The queue class name is "org.richfaces.queue.global"</para>
15 years, 9 months
JBoss Rich Faces SVN: r13140 - in trunk/test-applications/realworld2/web/src/main/webapp: includes/fileUpload and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-03-24 12:01:41 -0400 (Tue, 24 Mar 2009)
New Revision: 13140
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/login.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
Log:
Realworld: add registaration to menu
add links to shelfs and albums(breadcrumb)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/login.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
===================================================================
(Binary files differ)
15 years, 9 months
JBoss Rich Faces SVN: r13139 - trunk/test-applications/realworld2/doc.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2009-03-24 11:36:53 -0400 (Tue, 24 Mar 2009)
New Revision: 13139
Modified:
trunk/test-applications/realworld2/doc/description2.odt
Log:
Modified: trunk/test-applications/realworld2/doc/description2.odt
===================================================================
(Binary files differ)
15 years, 9 months
JBoss Rich Faces SVN: r13138 - in trunk/test-applications/realworld2/web/src/main: webapp/includes and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-24 11:25:45 -0400 (Tue, 24 Mar 2009)
New Revision: 13138
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageEditInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/login.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
Log:
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-24 15:25:30 UTC (rev 13137)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-03-24 15:25:45 UTC (rev 13138)
@@ -108,4 +108,12 @@
public List<MetaTag> popularTags() {
return imageAction.popularTags();
}
+
+ public List<MetaTag> autoComplete(Object suggest) {
+ String temp = (String)suggest;
+ if(temp.trim().equals("")){
+ return null;
+ }
+ return imageAction.getTagsLikeString((String)suggest);
+ }
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-03-24 15:25:30 UTC (rev 13137)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-03-24 15:25:45 UTC (rev 13138)
@@ -1,6 +1,7 @@
package org.richfaces.realworld.manager;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Scope;
@@ -14,6 +15,7 @@
@Name("model")
@Scope(ScopeType.CONVERSATION)
+@AutoCreate
public class Model {
private Integer selectedImageIndex = 1;
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageEditInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageList.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/login.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-24 15:25:30 UTC (rev 13137)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-24 15:25:45 UTC (rev 13138)
@@ -16,8 +16,8 @@
<a4j:mediaOutput rendered="#{!album.isEmpty()}" id="img" element="img"
createContent="#{imageLoader.paintImage}"
styleClass="album-cover-image"
- style="#{richx:rectangle(album.coveringImage.width, album.coveringImage.height, 120)}"
- value="#{fileManager.transformPath(album.coveringImage.path, '_mini')}">
+
+ value="#{fileManager.transformPath(album.coveringImage.path, '_small120')}">
</a4j:mediaOutput>
<h:graphicImage rendered="#{album.isEmpty()}"
style="width:80px; height:80px;"
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-03-24 15:25:30 UTC (rev 13137)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-03-24 15:25:45 UTC (rev 13138)
@@ -14,7 +14,7 @@
reRender="mainArea, tree">
<a4j:mediaOutput id="img" element="img"
createContent="#{imageLoader.paintImage}"
- style="border : 2px solid #FFFFFF; #{richx:rectangle(image.width, image.height, imageSizeHelper.currentDimension.x)};"
+ style="border : 2px solid #FFFFFF;"
value="#{fileManager.transformPath(image.path, imageSizeHelper.currentDimension.filePostfix)}">
<f:param value="#{imageSizeHelper.currentDimension.x}" name="x" />
</a4j:mediaOutput>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
===================================================================
(Binary files differ)
15 years, 9 months
JBoss Rich Faces SVN: r13137 - in trunk/test-applications/realworld2/ejb/src/main: java/org/richfaces/realworld/service and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-03-24 11:25:30 -0400 (Tue, 24 Mar 2009)
New Revision: 13137
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/MetaTag.java
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/ejb/src/main/resources/import.sql
Log:
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-03-24 15:02:53 UTC (rev 13136)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-03-24 15:25:30 UTC (rev 13137)
@@ -248,12 +248,21 @@
}
public String getMeta() {
- return meta;
+ StringBuilder s = new StringBuilder();
+ for(MetaTag tag: this.imageTags){
+ s.append(tag.getTag()+", ");
+ }
+ String string = s.toString();
+ return string.substring(0, string.length() - 2);
}
public void setMeta(String meta) {
this.meta = meta;
}
+
+ public String getMetaString(){
+ return meta;
+ }
public String getCameraModel() {
return cameraModel;
@@ -333,8 +342,26 @@
return this.equals(this.getAlbum().getCoveringImage());
}
- public void setCovering(Boolean covering) {
+ public void setCovering(boolean covering) {
this.covering = covering;
}
+
+ public boolean containTag(String s) {
+ for(MetaTag t : imageTags){
+ if(t.getTag().equals(s)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public MetaTag getTagByName(String s) {
+ for(MetaTag t : imageTags){
+ if(t.getTag().equals(s)){
+ return t;
+ }
+ }
+ return null;
+ }
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/MetaTag.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/MetaTag.java 2009-03-24 15:02:53 UTC (rev 13136)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/MetaTag.java 2009-03-24 15:25:30 UTC (rev 13137)
@@ -21,6 +21,7 @@
package org.richfaces.realworld.domain;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.persistence.Column;
@@ -54,7 +55,7 @@
private String tag;
@ManyToMany(mappedBy="imageTags")
- private List<Image> images;
+ private List<Image> images = new ArrayList<Image>();
public Long getId() {
return id;
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-24 15:02:53 UTC (rev 13136)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IImageAction.java 2009-03-24 15:25:30 UTC (rev 13137)
@@ -45,4 +45,6 @@
public abstract List<MetaTag> popularTags();
+ public abstract List<MetaTag> getTagsLikeString(String suggest);
+
}
\ 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-24 15:02:53 UTC (rev 13136)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ImageAction.java 2009-03-24 15:25:30 UTC (rev 13137)
@@ -20,10 +20,14 @@
*/
package org.richfaces.realworld.service;
+import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
@@ -48,20 +52,29 @@
}
public void editImage(Image image, boolean isFlushNeeded) {
- /*image.setImageTags(null);
- String[] tokens = image.getMeta().split(",");
- for(String token:tokens){
- MetaTag t =(MetaTag) em.createQuery("from MetaTag t where t.tag =:token").setParameter("token", token).getSingleResult();
- if(t != null){
- t.addImage(image);
- image.addMetaTag(t);
+ List<MetaTag> removals = new ArrayList<MetaTag>(image.getImageTags());
+ String[] tokens = image.getMetaString().split(",");
+ Set<String> toks = new HashSet<String>();
+ for(String s:tokens){
+ toks.add(s.trim());
+ }
+ for(String s:toks){
+ if(!image.containTag(s)){
+ MetaTag tag = getTagByName(s);
+ if(tag == null){
+ tag = new MetaTag();
+ tag.setTag(s);
+ }
+ image.addMetaTag(tag);
}else{
- MetaTag meta = new MetaTag();
- meta.setTag(token);
- t.addImage(image);
- image.addMetaTag(t);
+ MetaTag t = image.getTagByName(s);
+ removals.remove(t);
}
- }*/
+ }
+ for(MetaTag tag:removals){
+ image.removeMetaTag(tag);
+ tag.removeImage(image);
+ }
if(image.isCovering()){
if(!image.equals(image.getAlbum().getCoveringImage())){
image.getAlbum().setCoveringImage(image);
@@ -73,22 +86,6 @@
}
public void addImage(Image image, boolean isFlushNeeded) {
-/* String[] tokens = image.getMeta().split(",");
- for(String token:tokens){
- if(token.equals("")){
- continue;
- }
- MetaTag t =(MetaTag) em.createQuery("from MetaTag t where t.tag =:token").setParameter("token", token).getSingleResult();
- if(t != null){
- t.addImage(image);
- image.addMetaTag(t);
- }else{
- MetaTag meta = new MetaTag();
- meta.setTag(token);
- t.addImage(image);
- image.addMetaTag(t);
- }
- }*/
em.persist(image);
image.getAlbum().addImage(image);
if(isFlushNeeded){
@@ -111,10 +108,20 @@
}
public MetaTag getTagByName(String tag) {
- return (MetaTag)em.createQuery("from MetaTag m where m.tag =:tag").setParameter("tag", tag).getSingleResult();
+ MetaTag t;
+ try{
+ t = (MetaTag)em.createQuery("from MetaTag m where m.tag =:tag").setParameter("tag", tag).getSingleResult();
+ }catch(NoResultException nre){
+ return null;
+ }
+ return t;
}
public List<MetaTag> popularTags() {
- return (List<MetaTag>)em.createQuery("from MetaTag m order by count(m.images) desc").setMaxResults(20).getResultList();
+ return (List<MetaTag>)em.createQuery("select m from MetaTag m").setMaxResults(20).getResultList();
}
+
+ public List<MetaTag> getTagsLikeString(String suggest) {
+ return (List<MetaTag>)em.createQuery("select m from MetaTag m where lower(m.tag) like :tag").setParameter("tag", suggest + "%").getResultList();
+ }
}
Modified: trunk/test-applications/realworld2/ejb/src/main/resources/import.sql
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-24 15:02:53 UTC (rev 13136)
+++ trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-24 15:25:30 UTC (rev 13137)
@@ -65,7 +65,7 @@
---------------------------------------------------------------------
-- ALBUM - Building
---------------------------------------------------------------------
-INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (1, 'Building', 'Building pictures', 2, 2, '2009-12-18');
+INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (1, 'Building', 'Building pictures', 2, 3, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (1, 'Building');
INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (15, '1.jpg', 'Viking/1/1.jpg', 'Building - 1.jpg image', '2009-12-18', 1, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
@@ -130,7 +130,7 @@
---------------------------------------------------------------------
-- ALBUM - Coasts
---------------------------------------------------------------------
-INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (2, 'Coasts', 'Coasts pictures', 3, 3, '2009-12-18');
+INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (2, 'Coasts', 'Coasts pictures', 3, 4, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (2, 'Coasts');
INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (30, '203015.JPG', 'Noname/2/203015.JPG', 'Coasts - 203015.JPG image', '2009-12-18', 2, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
@@ -194,7 +194,7 @@
---------------------------------------------------------------------
-- ALBUM - Flora
---------------------------------------------------------------------
-INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (3, 'Flora', 'Flora pictures', 1, 4, '2009-12-18');
+INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (3, 'Flora', 'Flora pictures', 1, 2, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (3, 'Flora');
INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (45, '132000.JPG', 'amarkhel/3/132000.JPG', 'Flora - 132000.JPG image', '2009-12-18', 3, 'Pentax Optio E40', 1024, 1917, 768, '2009-12-01', true);
@@ -264,7 +264,7 @@
---------------------------------------------------------------------
-- ALBUM - Ices
---------------------------------------------------------------------
-INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (4, 'Ices', 'Ices pictures', 2, 1, '2009-12-18');
+INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (4, 'Ices', 'Ices pictures', 2, 3, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (4, 'Ices');
INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (60, '184023.JPG', 'Viking/4/184023.JPG', 'Ices - 184023.JPG image', '2009-12-18', 4, 'BBK DP810', 1024, 1917, 768, '2009-12-01', true);
@@ -359,7 +359,7 @@
---------------------------------------------------------------------
-- ALBUM - Sport
---------------------------------------------------------------------
-INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (5, 'Sport', 'Sport pictures', 3, 2, '2009-12-18');
+INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (5, 'Sport', 'Sport pictures', 3, 4, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (5, 'Sport');
INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (80, '23048.JPG', 'Noname/5/23048.JPG', 'Sport - 23048.JPG image', '2009-12-18', 5, 'Canon PowerShot SX110 IS', 1024, 1917, 768, '2009-12-01', true);
@@ -424,7 +424,7 @@
---------------------------------------------------------------------
-- ALBUM - Underwater
---------------------------------------------------------------------
-INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (6, 'Underwater', 'Underwater pictures', 1, 3, '2009-12-18');
+INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (6, 'Underwater', 'Underwater pictures', 1, 1, '2009-12-18');
INSERT INTO metatags(metatag_id, tag) VALUES (6, 'Underwater');
INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (95, '45000.JPG', 'amarkhel/6/45000.JPG', 'Underwater - 45000.JPG image', '2009-12-18', 6, 'Sony Alpha DSLR-A350', 1024, 1917, 768, '2009-12-01', true);
15 years, 9 months
JBoss Rich Faces SVN: r13136 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-03-24 11:02:53 -0400 (Tue, 24 Mar 2009)
New Revision: 13136
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
Log:
https://jira.jboss.org/jira/browse/RF-6560
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2009-03-24 14:22:54 UTC (rev 13135)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2009-03-24 15:02:53 UTC (rev 13136)
@@ -364,7 +364,7 @@
@Override
public void addNode(Object parentRowKey, TreeNode newNode, Object id) {
- addNode(parentRowKey, newNode, id);
+ addNode(parentRowKey, (Object) newNode, id);
}
public void addNode(Object parentRowKey, Object newNode, Object id) {
15 years, 9 months
JBoss Rich Faces SVN: r13135 - trunk/test-applications/realworld2/doc.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2009-03-24 10:22:54 -0400 (Tue, 24 Mar 2009)
New Revision: 13135
Added:
trunk/test-applications/realworld2/doc/description2.odt
Removed:
trunk/test-applications/realworld2/doc/description.odt
Log:
Deleted: trunk/test-applications/realworld2/doc/description.odt
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/doc/description2.odt
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/doc/description2.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 9 months
JBoss Rich Faces SVN: r13134 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-03-24 09:26:49 -0400 (Tue, 24 Mar 2009)
New Revision: 13134
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java
Log:
RF-6523
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java 2009-03-24 09:45:17 UTC (rev 13133)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuGroupTest.java 2009-03-24 13:26:49 UTC (rev 13134)
@@ -40,7 +40,7 @@
@Test
public void testOncollapseOnexpandEventsFired(Template template) {
- renderPage(LOOK_AND_FEEL_TEST_URL, template, null);
+ renderPage(LOOK_AND_FEEL_TEST_URL, template, RESET_METHOD);
writeStatus("Check oncollapse/onexpand events are fired ");
15 years, 9 months
JBoss Rich Faces SVN: r13133 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-03-24 05:45:17 -0400 (Tue, 24 Mar 2009)
New Revision: 13133
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
https://jira.jboss.org/jira/browse/RF-6154
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2009-03-24 09:24:56 UTC (rev 13132)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2009-03-24 09:45:17 UTC (rev 13133)
@@ -379,11 +379,13 @@
var anchor = oldnode.parentNode;
if(!window.opera && !A4J.AJAX.isWebkitBreakingAmps() && oldnode.outerHTML && !oldnode.tagName.match( /(tbody|thead|tfoot|tr|th|td)/i ) ){
LOG.debug("Replace content of node by outerHTML()");
- try {
- oldnode.innerHTML = "";
- } catch(e){
- LOG.error("Error to clear node content by innerHTML "+e.message);
- Sarissa.clearChildNodes(oldnode);
+ if (!Sarissa._SARISSA_IS_IE || oldnode.tagName.toLowerCase()!="table") {
+ try {
+ oldnode.innerHTML = "";
+ } catch(e){
+ LOG.error("Error to clear node content by innerHTML "+e.message);
+ Sarissa.clearChildNodes(oldnode);
+ }
}
oldnode.outerHTML = new XMLSerializer().serializeToString(newnode);
} else {
15 years, 9 months