JBoss Rich Faces SVN: r13376 - trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2009-04-03 10:11:07 -0400 (Fri, 03 Apr 2009)
New Revision: 13376
Modified:
trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
Log:
https://jira.jboss.org/jira/browse/RF-6673
Modified: trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js
===================================================================
--- trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2009-04-03 13:32:44 UTC (rev 13375)
+++ trunk/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/tiny_mce_src.js 2009-04-03 14:11:07 UTC (rev 13376)
@@ -94,7 +94,7 @@
if (!t)
return n != 'undefined';
- if (t == 'array' && (o instanceof Array))
+ if (t == 'array' && o.hasOwnProperty && (o instanceof Array)) //RF: applied 2619922 patch // not needed for update tinymce
return true;
return n == t;
@@ -835,7 +835,7 @@
}
if (t == 'object') {
- if (o instanceof Array) {
+ if (o.hasOwnProperty && o instanceof Array) { //RF: applied 2619922 patch // not needed for update tinymce
for (i=0, v = '['; i<o.length; i++)
v += (i > 0 ? ',' : '') + s(o[i]);
@@ -2460,7 +2460,7 @@
var cb, t = this, el = t.events, r;
// Handle array
- if (o && o instanceof Array) {
+ if (o && o.hasOwnProperty && o instanceof Array) { //RF: applied 2619922 patch // not needed for update tinymce
r = [];
each(o, function(o) {
@@ -2522,7 +2522,7 @@
var t = this, a = t.events, s = false, r;
// Handle array
- if (o && o instanceof Array) {
+ if (o && o.hasOwnProperty && o instanceof Array) { //RF: applied 2619922 patch // not needed for update tinymce
r = [];
each(o, function(o) {
15 years, 1 month
JBoss Rich Faces SVN: r13375 - in trunk/test-applications/realworld2: ejb/src/main/java/org/richfaces/realworld/service and 19 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: amarkhel
Date: 2009-04-03 09:32:44 -0400 (Fri, 03 Apr 2009)
New Revision: 13375
Added:
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/confirmation.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/createShelf.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/avatar.xhtml
Removed:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileItem.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileManagerTest.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/test.java
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/
trunk/test-applications/realworld2/web/src/main/webapp/main.xhtml
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
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/java/org/richfaces/realworld/manager/RegistrationManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByShelf.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileUploadBean.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/DirectLinkHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ErrorHandlerBean.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/Help.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/pages.xml
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/directImage.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.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/image/slideshow.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/imageEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/menu.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/tree.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/errorPanel.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/modalPanels.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefs.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js
Log:
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -46,6 +46,7 @@
import org.hibernate.validator.NotEmpty;
import org.hibernate.validator.NotNull;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Role;
import org.jboss.seam.annotations.Scope;
@@ -59,6 +60,7 @@
@Name("album")
@Table(name = "albums")
@Scope(ScopeType.CONVERSATION)
+@AutoCreate
public class Album implements Serializable {
private static final long serialVersionUID = -7042878411608396483L;
@@ -72,7 +74,6 @@
@NotNull
@NotEmpty
@Length(min = 3, max = 50)
- //TODO nick - add maxLength validation here and everywhere?
private String name;
@Column(length = 1024)
@@ -166,18 +167,16 @@
public void addImage(Image image) {
if (image == null) {
throw new IllegalArgumentException("Null image!");
+ }if(this.getImages().contains(image)){
+ return;
}
if (image.getAlbum() != null && !this.equals(image.getAlbum())) {
//TODO nick - use removeImage()
- if(image.getAlbum().getUnvisitedImages().contains(image)){
- image.getAlbum().getUnvisitedImages().remove(image);
- }
- if(image.getAlbum().getShelf().getUnvisitedImages().contains(image)){
- image.getAlbum().getShelf().getUnvisitedImages().remove(image);
- }
image.getAlbum().removeImage(image);
+ }if(!image.isVisited()){
+ this.getShelf().getUnvisitedImages().add(image);
+ this.getUnvisitedImages().add(image);
}
- this.setUnvisitedImages(new ArrayList<Image>());
image.setAlbum(this);
images.add(image);
}
@@ -194,6 +193,12 @@
}
//TODO nick - check if image is in the current album
if(image.getAlbum().equals(this)){
+ if(image.getAlbum().getUnvisitedImages().contains(image)){
+ image.getAlbum().getUnvisitedImages().remove(image);
+ }
+ if(image.getAlbum().getShelf().getUnvisitedImages().contains(image)){
+ image.getAlbum().getShelf().getUnvisitedImages().remove(image);
+ }
image.setAlbum(null);
images.remove(image);
}else{
@@ -268,10 +273,14 @@
this.unvisitedImages = unvisitedImages;
}
- public void visitImage(Image image) {
+ public void visitImage(Image image, boolean isSetVisited) {
if (unvisitedImages.contains(image)) {
unvisitedImages.remove(image);
+ if(this.getShelf().getUnvisitedImages().contains(image)){
+ this.getShelf().getUnvisitedImages().remove(image);
+ }
}
+ image.setVisited(isSetVisited);
}
public void setCoveringImage(Image coveringImage) {
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-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Image.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -52,9 +52,11 @@
import org.hibernate.validator.NotEmpty;
import org.hibernate.validator.NotNull;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Role;
import org.jboss.seam.annotations.Scope;
+import org.richfaces.realworld.service.ActionTools;
@NamedQueries({
@NamedQuery(
@@ -74,6 +76,7 @@
@Name("image")
@Table(name = "Images")
@Scope(ScopeType.CONVERSATION)
+@AutoCreate
public class Image implements Serializable {
private static final long serialVersionUID = -7042878411608396483L;
@@ -108,7 +111,8 @@
referencedColumnName = "METATAG_ID"))
protected List<MetaTag> imageTags = new ArrayList<MetaTag>();
-
+ @Transient
+ private boolean visited;
/*
* Comma separated tag value
* */
@@ -388,4 +392,19 @@
result = 31 * result + (path != null ? path.hashCode() : 0);
return result;
}
+
+ public boolean isVisited() {
+ return visited;
+ }
+
+ public void setVisited(boolean visited) {
+ this.visited = visited;
+ }
+
+ public boolean isNew(){
+ if(!visited){
+ return this.getUploaded().after(ActionTools.getRecentlyDate());
+ }
+ return false;
+ }
}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -23,6 +23,7 @@
import org.hibernate.validator.NotEmpty;
import org.hibernate.validator.NotNull;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@@ -30,6 +31,7 @@
@Name("shelf")
@Scope(ScopeType.CONVERSATION)
@Table(name = "shelves")
+@AutoCreate
public class Shelf implements Serializable {
private static final long serialVersionUID = -7042878411608396483L;
@@ -124,22 +126,26 @@
public void addAlbum(Album album) {
if (album == null)
- throw new IllegalArgumentException("Null child!");
- if (album.getShelf() != null){
- //TODO nick - use removeChildAlbum()
- album.getShelf().setUnvisitedImages(new ArrayList<Image>());
- album.getShelf().removeChildAlbum(album);
+ throw new IllegalArgumentException("Null album!");
+ if (album.getShelf() != null && !album.getShelf().getAlbums().contains(this)){
+ album.getShelf().removeAlbum(album);
+ album.setShelf(this);
+ for(Image i : album.getImages()){
+ if(i.isNew()){
+ this.getUnvisitedImages().add(i);
+ }
+ }
+ albums.add(album);
}
- album.setShelf(this);
- this.setUnvisitedImages(new ArrayList<Image>());
- albums.add(album);
}
- public void removeChildAlbum(Album album) {
+ public void removeAlbum(Album album) {
if (album == null)
- throw new IllegalArgumentException("Null child!");
- //TODO nick - check that shelf is "this"
+ throw new IllegalArgumentException("Null album!");
if(album.getShelf().equals(this)){
+ for(Image i : album.getImages()){
+ album.visitImage(i, false);
+ }
album.setShelf(null);
albums.remove(album);
}else{
@@ -195,12 +201,6 @@
this.unvisitedImages = unvisitedImages;
}
- public void visitImage(Image image) {
- if (unvisitedImages.contains(image)) {
- unvisitedImages.remove(image);
- }
- }
-
public Album getFirstAlbum() {
//TODO nick - use random album for cover?
if (this.albums.size() > 0) {
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/User.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -121,7 +121,10 @@
@NotNull
private Sex sex;
-
+ @Transient
+ private Long countImages;
+ @Transient
+ private Long countAlbums;
private Boolean hasAvatar;
@OneToMany(mappedBy = "owner", cascade = { CascadeType.ALL})
@@ -192,9 +195,10 @@
if (shelf == null) {
throw new IllegalArgumentException("Null shelf!");
}
- //TODO nick - remove shelf from the previous user?
- shelf.setOwner(this);
- shelfs.add(shelf);
+ if(!shelfs.contains(shelf)){
+ shelf.setOwner(this);
+ shelfs.add(shelf);
+ }
}
public void removeShelf(Shelf shelf) {
@@ -210,6 +214,11 @@
}
}
+ public void updateStatistics() {
+ countAlbums = null;
+ countImages = null;
+ }
+
public String getConfirmPassword() {
return confirmPassword;
}
@@ -263,4 +272,20 @@
}
return images;
}
+
+ public Long getCountImages() {
+ return countImages;
+ }
+
+ public void setCountImages(Long countImages) {
+ this.countImages = countImages;
+ }
+
+ public Long getCountAlbums() {
+ return countAlbums;
+ }
+
+ public void setCountAlbums(Long countAlbums) {
+ this.countAlbums = countAlbums;
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -56,10 +56,10 @@
}
public void deleteAlbum(Album album){
- if(album.getShelf()!=null){
- album.getShelf().setUnvisitedImages(new ArrayList<Image>());
+ if(album.getShelf()==null){
+ return;
}
- album.getShelf().removeChildAlbum(album);
+ album.getShelf().removeAlbum(album);
em.remove(album);
if(flushStrategy.isDatabaseStoreStrategy()){
em.flush();
@@ -74,7 +74,7 @@
public List<Image> getUnvisitedImages(Album album){
//TODO nick - use Shelf/Album.unvisitedImages
- return (List<Image>)em.createQuery("from Image i where i.album=:album and i.created >= :date").setParameter("album", album).setParameter("date", getDate()).getResultList();
+ return (List<Image>)em.createQuery("from Image i where i.album=:album and i.uploaded > :date").setParameter("album", album).setParameter("date", getDate()).getResultList();
}
private Date getDate() {
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -2,17 +2,20 @@
import java.util.List;
+import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.MetaTag;
import org.richfaces.realworld.domain.Shelf;
+import org.richfaces.realworld.domain.User;
public interface ISearchAction {
public List<Image> searchByImage(String query, boolean searchInMyAlbums, boolean searchInShared);
- public List<Image> searchByTags(String query, boolean searchInMyAlbums, boolean searchInShared);
+ public List<MetaTag> searchByTags(String query, boolean searchInMyAlbums, boolean searchInShared);
- public List<Image> searchByAlbum(String query, boolean searchInMyAlbums, boolean searchInShared);
+ public List<Album> searchByAlbum(String query, boolean searchInMyAlbums, boolean searchInShared);
- public List<Image> searchByUsers(String query, boolean searchInMyAlbums, boolean searchInShared);
+ public List<User> searchByUsers(String query, boolean searchInMyAlbums, boolean searchInShared);
public List<Shelf> searchByShelfs(String query,boolean searchInMyAlbums, boolean searchInShared);
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -35,8 +35,8 @@
public boolean isUserExist(String login);
public User updateUser();
public User resetUser();
- public Long countAlbums(User user);
- public Long countImages(User user);
+ public Long countAlbums();
+ public Long countImages();
public Long countSharedImages(User u);
public Long countSharedAlbums(User user);
public List<Album> getSharedAlbums(User user);
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -10,7 +10,9 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
+import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.MetaTag;
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.domain.User;
@@ -27,7 +29,7 @@
@In @Out
private User user;
- public List<Image> searchByAlbum(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) {
+ public List<Album> searchByAlbum(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) {
StringBuilder b = new StringBuilder("from Album a where lower(a.name) like :name or lower(a.description) like :name");
if (searchInMyAlbums) {
b.append(" and a.owner.login=:login");
@@ -67,7 +69,7 @@
return query.getResultList();
}
- public List<Image> searchByUsers(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) {
+ public List<User> searchByUsers(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) {
StringBuilder b = new StringBuilder("select u from User u where lower(u.login) like :name or lower(u.firstName) like :name or lower(u.secondName) like :name");
Query query = em.createQuery(b.toString());
@@ -76,7 +78,7 @@
return query.getResultList();
}
- public List<Image> searchByTags(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) {
+ public List<MetaTag> searchByTags(String searchQuery, boolean searchInMyAlbums, boolean searchInShared) {
StringBuilder b = new StringBuilder("from MetaTag t where lower(t.tag) like :name");
Query query = em.createQuery(b.toString());
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -86,7 +86,7 @@
return (List<Image>)em.createQuery("from Image i where i.album.shelf.owner=:user and i.album.shelf.shared=true").setParameter("user", user).getResultList();
}
- public Long countAlbums(User user){
+ public Long countAlbums(){
return (Long)em.createQuery("select count(a) from Album a where a.shelf.owner=:user").setParameter("user", user).getSingleResult();
}
@@ -94,7 +94,7 @@
return (Long)em.createQuery("select count(a) from Album a where a.shelf.owner=:user and a.shelf.shared=true").setParameter("user", user).getSingleResult();
}
- public Long countImages(User user){
+ public Long countImages(){
return (Long)em.createQuery("select count(i) from Image i where i.album.shelf.owner=:user").setParameter("user", user).getSingleResult();
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -31,6 +31,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.jboss.seam.faces.FacesMessages;
@@ -57,6 +58,7 @@
@In FacesMessages facesMessages;
@In @Out Model model;
+ @Restrict("#{s:hasRole('admin')}")
public void addAlbum(Album album){
if(album.getShelf() == null){
facesMessages.addToControl("shelf", "Shelf must be not-null", null);
@@ -73,6 +75,7 @@
Events.instance().raiseEvent("clearTree");
}
+ @Restrict("#{s:hasRole('admin')}")
public void createAlbum(Shelf shelf){
Album album = new Album();
if(shelf == null){
@@ -80,7 +83,7 @@
shelf = user.getShelfs().get(0);
}
if(shelf == null){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("You must create at least one shelf before creating album!"));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "You must create at least one shelf before creating album!");
return;
}
}
@@ -88,12 +91,14 @@
Contexts.getConversationContext().set("album", album);
}
+ @Restrict("#{s:hasRole('admin')}")
public void editAlbum(Album album){
albumAction.editAlbum(album);
model.resetModel(NavigationEnum.ALBUM_PREVIEW, model.getSelectedUser(), model.getSelectedShelf(), album, null);
Events.instance().raiseEvent("albumEdited");
}
+ @Restrict("#{s:hasRole('admin')}")
public void deleteAlbum(Album album){
//Update domain model
String string = album.getId().toString();
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Authenticator.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -80,7 +80,6 @@
private boolean loginFailed = false;
public String login(){
- setLoginFailed(false);
if(identity.hasRole("admin")){
//TODO nick - return null
return "";
@@ -93,7 +92,7 @@
try {
identity.authenticate();
//TODO nick - maybe clearShelves() before trying to aunthenticate?
- shelfManager.clearShelfs();
+ //shelfManager.clearShelfs();
} catch (LoginException e) {
setLoginFailed(true);
credentials.clear();
@@ -105,7 +104,7 @@
}
return "main";
}
-
+
public boolean authenticate()
{
if (wantLoginAnonymous()) {
@@ -136,18 +135,6 @@
return "logout";
}
- public String loginAnonymous(){
- credentials.setUsername(null);
- credentials.setPassword(null);
- try {
- identity.authenticate();
- } catch (LoginException e) {
- facesMessages.add(INVALID_LOGIN_OR_PASSWORD);
- return "";
- }
- return Constants.MAIN_OUTCOME;
- }
-
public String start(){
if(!identity.isLoggedIn()){
credentials.clear();
@@ -184,6 +171,4 @@
public void setLoginFailed(boolean loginFailed) {
this.loginFailed = loginFailed;
}
-
-
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -28,6 +28,7 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Synchronized;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
import org.richfaces.event.DataScrollerEvent;
import org.richfaces.realworld.domain.Album;
@@ -38,8 +39,7 @@
import org.richfaces.realworld.service.Constants;
@Name("controller")
-(a)Scope(ScopeType.CONVERSATION)
-@Synchronized(timeout=200000)
+(a)Scope(ScopeType.EVENT)
public class Controller implements Serializable{
private static final long serialVersionUID = 5656562187249324512L;
@@ -69,11 +69,13 @@
public void selectImages(){
model.resetModel(NavigationEnum.ALL_IMAGES, user, null, null, null);
+ model.setImages(user.getAllImages());
}
+ @Restrict("#{s:hasRole('admin')}")
public void startEditShelf(Shelf shelf){
if(!canViewShelf(shelf)){
- pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS));
+ pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
return;
}
model.resetModel(NavigationEnum.SHELF_EDIT, shelf.getOwner(), shelf, null, null);
@@ -86,7 +88,7 @@
public void showAlbum(Album album){
if(!canViewAlbum(album)){
- pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS));
+ pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
return;
}
model.resetModel(NavigationEnum.ALBUM_PREVIEW, album.getOwner(), album.getShelf(), album, null);
@@ -95,14 +97,13 @@
public void showImage(Image image){
if(!canViewImage(image)){
- pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS));
+ pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
return;
}
model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image);
//TODO nick - model should already has enough information to set up image index
model.setSelectedImageIndex(model.getSelectedAlbum().getIndex(model.getSelectedImage())+1);
- image.getAlbum().getShelf().visitImage(image);
- image.getAlbum().visitImage(image);
+ image.getAlbum().visitImage(image, true);
}
public void scroll(DataScrollerEvent e){
@@ -110,14 +111,13 @@
model.setSelectedImageIndex(index);
Image image = model.getSelectedAlbum().getImages().get(index - 1);
model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image);
- image.getAlbum().visitImage(image);
- //TODO nick - album can notify shelf
- image.getAlbum().getShelf().visitImage(image);
+ image.getAlbum().visitImage(image, true);
}
+ @Restrict("#{s:hasRole('admin')}")
public void startEditImage(Image image){
if(!canViewImage(image)){
- pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS));
+ pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
return;
}
//TODO nick - resetModel?
@@ -141,9 +141,10 @@
return image.getAlbum().getOwner().getLogin().equals(user.getLogin());
}
+ @Restrict("#{s:hasRole('admin')}")
public void startEditAlbum(Album album){
if(!album.getOwner().getLogin().equals(user.getLogin())){
- pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS));
+ pushEvent(Constants.ADD_ERROR_EVENT, HAVENT_ACCESS);
return;
}
//TODO nick - resetModel?
@@ -160,7 +161,7 @@
public void showFileUpload(){
if(!(user.getShelfs().size() > 0)){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("You must create at least one shelf before creating album!"));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "You must create at least one shelf before creating album!");
return;
}
model.setMainArea(NavigationEnum.FILE_UPLOAD);
@@ -204,7 +205,7 @@
public void showUnvisitedImages(Album album){
model.resetModel(NavigationEnum.ALBUM_UNVISITED, album.getShelf().getOwner(), album.getShelf(), album, null);
- model.setImages(album.getUnvisitedImages());
+ model.setImages(albumManager.getUnvisitedImages(album));
}
public void showTag(MetaTag metatag){
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -24,6 +24,7 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
import org.richfaces.component.Dropzone;
import org.richfaces.event.DropEvent;
@@ -43,13 +44,14 @@
@In FileManager fileManager;
@In IAlbumAction albumAction;
+ @Restrict("#{s:hasRole('admin')}")
public void processDrop(DropEvent dropEvent) {
Dropzone dropzone = (Dropzone) dropEvent.getComponent();
Object dragValue = dropEvent.getDragValue();
Object dropValue = dropzone.getDropValue();
if(dragValue instanceof Image){
if(!((Album)dropValue).getOwner().getLogin().equals(user.getLogin())){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("You can't add photo's to that album"));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "You can't add photo's to that album");
return;
}
handleImage((Image)dragValue, (Album)dropValue);
@@ -73,8 +75,9 @@
String newPath = getNewPathOfImage(dragValue, dropValue);
dragValue.setPath(newPath);
dropValue.addImage(dragValue);
- dropValue.setUnvisitedImages(new ArrayList<Image>());
albumAction.editAlbum(dropValue);
+ Events.instance().raiseEvent("DNDUploadedEvent", dragValue);
+
}
private String getNewPathOfImage(Image dragValue, Album dropValue) {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/FileManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -26,6 +26,7 @@
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.security.Restrict;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
@@ -63,31 +64,8 @@
private static final String UPLOAD_ROOT_COMPONENT_NAME = "uploadRoot";
private static final String UPLOAD_ROOT_PATH_COMPONENT_NAME = "uploadRootPath";
- private static final String IMAGE_JAR = "images.jar";
-
private File uploadRoot;
private String uploadRootPath;
-
- /* @Create
- public void create() {
- uploadRoot = (File) Component.getInstance(UPLOAD_ROOT_COMPONENT_NAME, ScopeType.APPLICATION);
- if (!uploadRoot.exists() && !uploadRoot.mkdir()) {
- logError("Can't create directory: " + uploadRoot.getName(), null);
- }
-
- uploadRootPath = (String) Component.getInstance(UPLOAD_ROOT_PATH_COMPONENT_NAME, ScopeType.APPLICATION);
-
- final JarFile jarFile;
- try {
- jarFile = new JarFile(this.getClass().getClassLoader()
- .getResource("WEB-INF/lib/" + IMAGE_JAR).getPath());
- } catch (IOException e) {
- logError(IMAGE_JAR + " not found, please check it in WEB-INF/lib ", e);
- return;
- }
-
- extract(jarFile);
- }*/
@Create
public void create() {
@@ -112,98 +90,20 @@
}
}
- private String joinFiles(String... files) {
- final StringBuilder res = new StringBuilder();
- for (String file : files) {
- res.append(file).append(File.pathSeparatorChar);
- }
-
- return res.substring(0, res.length() - 1);
- }
-
- private void logError(String s, Exception e) {
- if (s != null) {
- System.out.println(s);
- }
-
- if (e != null) {
- e.printStackTrace();
- }
- }
-
- public void extract(JarFile jarFile) {
- final Enumeration<JarEntry> entries = jarFile.entries();
- while (entries.hasMoreElements()) {
- final JarEntry jarEntry = entries.nextElement();
- System.out.println("Extracting file : " + jarEntry.getName());
- final File tmpFile = new File(joinFiles(uploadRootPath, jarEntry.getName()));
- if (jarEntry.isDirectory()) {
- if (!tmpFile.mkdir()) {
- logError("Can't create directory: " + tmpFile.getName(), null);
- return;
- }
- } else {
- extractEntryFile(jarFile, jarEntry, tmpFile);
- }
- }
- }
-
- private void extractEntryFile(JarFile jarFile, ZipEntry jarEntry, File tmpFile) {
- try {
- final InputStream in = jarFile.getInputStream(jarEntry);
- final FileOutputStream out = new FileOutputStream(tmpFile);
-
- int readedBytes = in.read();
- while (readedBytes != -1) {
- out.write(readedBytes);
- readedBytes = in.read();
- }
-
- out.close();
- in.close();
- } catch (FileNotFoundException e) {
- logError(e.getMessage(), e);
- } catch (IOException e) {
- logError(e.getMessage(), e);
- }
- }
-
-/* public void setUploadRoot(String uploadRootPath) throws IOException {
- if (uploadRootPath != null) {
- this.uploadRoot = new File(uploadRootPath);
- for (String f : uploadRoot.list()) {
- final File temp = new File(uploadRoot, f);
- temp.delete();
- }
- uploadRoot.delete();
- uploadRoot.mkdirs();
- this.uploadRootPath = this.uploadRoot.getCanonicalPath() + File.separator;
- } else {
- this.uploadRoot = null;
- this.uploadRootPath = null;
- }
- }*/
-
-
- private File getFileByPath(String path) {
+ public File getFileByPath(String path) {
if (this.uploadRoot != null) {
File result = new File(this.uploadRoot, path);
-
try {
final String resultCanonicalPath = result.getCanonicalPath();
if (!resultCanonicalPath.startsWith(this.uploadRootPath)) {
- // TODO log error
result = null;
}
return result;
} catch (IOException e) {
- // TODO: handle exception
result = null;
}
-
return result;
}
-
return null;
}
@@ -212,6 +112,7 @@
return file.exists() && file.isDirectory();
}
+ @Restrict("#{s:hasRole('admin')}")
public void deleteDirectory(String... directories) {
final File file = getFileByPath(joinFiles(directories).toString());
if (file.exists()) {
@@ -223,6 +124,17 @@
}
}
+
+ private String joinFiles(String... files) {
+ final StringBuilder res = new StringBuilder();
+ for (String file : files) {
+ res.append(file).append(File.pathSeparatorChar);
+ }
+
+ return res.substring(0, res.length() - 1);
+ }
+
+ @Restrict("#{s:hasRole('admin')}")
public boolean renameDirectory(String directoryOld, String directoryNew) {
final File fileOld = getFileByPath(directoryOld);
final File fileNew = getFileByPath(directoryNew);
@@ -239,6 +151,7 @@
return true;
}
+ @Restrict("#{s:hasRole('admin')}")
public void addDirectory(String... directories) {
final StringBuilder directory = new StringBuilder();
for (String chunk : directories) {
@@ -249,11 +162,13 @@
file.mkdirs();
}
+ @Restrict("#{s:hasRole('admin')}")
public boolean saveAvatar(String path, User user) {
return writeFile("/" + user.getLogin() +
"/avatar.jpg", path, "", 80, true);
}
+ @Restrict("#{s:hasRole('admin')}")
public void renameImage(String fileNameOld, String fileNameNew) {
createDirectoryIfNotExist(fileNameNew);
renameImage(getFileByPath(fileNameNew), getFileByPath(fileNameOld));
@@ -274,7 +189,7 @@
getFileByPath(transformPath(fileNameOld, _SMALL200)));
}
-
+ @Restrict("#{s:hasRole('admin')}")
public void deleteImage(String fileName) {
deleteImage(getFileByPath(fileName));
deleteImage(getFileByPath(transformPath(fileName, _MEDIUM)));
@@ -284,6 +199,7 @@
deleteImage(getFileByPath(transformPath(fileName, _SMALL200)));
}
+ @Restrict("#{s:hasRole('admin')}")
public boolean addImage(String fileName, String tempFilePath) {
createDirectoryIfNotExist(fileName);
if(!writeFile(fileName, tempFilePath, _SMALL80, 80, true)){
@@ -395,6 +311,7 @@
return ret;
}
+ @Restrict("#{s:hasRole('admin')}")
public boolean writeFile(String newFileName, String fileName,
String pattern, int size, boolean includeUploadRoot) {
BufferedImage bsrc = null;
@@ -462,17 +379,7 @@
return getFileByPath(fileName) != null && getFileByPath(fileName).exists() && !getFileByPath(fileName).isDirectory();
}
- public File getImage(String fileName) {
- if (isImagePresent(fileName)) {
- return getFileByPath(fileName);
- }
- return null;
- }
-
- public File getImageFile(String fileName) {
- return new File(fileName);
- }
-
+ @Restrict("#{s:hasRole('admin')}")
public void deleteDirectories(Iterable<String> directoriesToDelete) {
for (String directory : directoriesToDelete) {
deleteDirectory(directory);
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-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ImageManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -23,6 +23,10 @@
import java.util.Date;
import java.util.List;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpServletRequest;
+
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
@@ -30,21 +34,24 @@
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.Comment;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.MetaTag;
import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.Constants;
-import org.richfaces.realworld.service.FlushStrategy;
import org.richfaces.realworld.service.IImageAction;
-import org.richfaces.realworld.util.DirectLinkHelper;
@Name("imageManager")
-(a)Scope(ScopeType.CONVERSATION)
+(a)Scope(ScopeType.EVENT)
@AutoCreate
public class ImageManager {
+ private static final String IMAGE_DIRECT_LINK = "/includes/directImage.seam?imageId=";
+
+ private static String imageDirectLinkPrefix;
+
@In
IImageAction imageAction;
@@ -57,6 +64,7 @@
@In
private User user;
+ @Restrict("#{s:hasRole('admin')}")
public void deleteImage(Image image) {
//TODO nick - should we check image owner?
String imagePath = image.getPath();
@@ -68,12 +76,14 @@
Events.instance().raiseEvent("imageDeleted");
}
+ @Restrict("#{s:hasRole('admin')}")
public void editImage(Image image) {
imageAction.editImage(image);
Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_IMAGE_PREVIEW);
Events.instance().raiseEvent("imageEdited");
}
+ @Restrict("#{s:hasRole('admin')}")
//TODO nick - Constants.ADD_IMAGE_EVENT is not used anywhere else
@Observer(Constants.ADD_IMAGE_EVENT)
public void addImage(Image image) {
@@ -82,12 +92,13 @@
Events.instance().raiseEvent("imageAdded");
}
+ @Restrict("#{s:hasRole('admin')}")
public void addComment(Image image, String message) {
if (null == user.getLogin()) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("For vote on this picture you must login"));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "For vote on this picture you must login");
return;
}if(message.trim().equals("")){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("Comment must be not-null"));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "Comment must be not-null");
return;
}
Comment comment = new Comment();
@@ -99,6 +110,7 @@
Events.instance().raiseEvent(Constants.CLEAR_EDITOR_EVENT, "");
}
+ @Restrict("#{s:hasRole('admin')}")
public void deleteComment(Comment comment) {
imageAction.deleteComment(comment);
}
@@ -114,4 +126,31 @@
}
return imageAction.getTagsLikeString((String)suggest);
}
+
+ public String getImageDirectLink(Image image) {
+ if (imageDirectLinkPrefix == null) {
+ FacesContext context = FacesContext.getCurrentInstance();
+ if (context == null) {
+ return null;
+ }
+ ExternalContext extc = context.getExternalContext();
+ if (extc == null) {
+ return null;
+ }
+
+ //TODO nick - see org.ajax4jsf.renderkit.RendererUtils#encodeResourceURL(TemplateContext, Object)
+ Object request = extc.getRequest();
+
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest servletRequest = (HttpServletRequest)request;
+ String contextPath = servletRequest.getContextPath();
+ StringBuffer url = servletRequest.getRequestURL();
+ int i = url.indexOf(contextPath);
+ if (i > 0) {
+ imageDirectLinkPrefix = url.substring(0, i) + contextPath + IMAGE_DIRECT_LINK;
+ }
+ }
+ }
+ return imageDirectLinkPrefix + image.getId();
+ }
}
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-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Model.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -1,5 +1,6 @@
package org.richfaces.realworld.manager;
+import java.io.Serializable;
import java.util.List;
import org.jboss.seam.ScopeType;
@@ -18,9 +19,10 @@
@Name("model")
@Scope(ScopeType.CONVERSATION)
@AutoCreate
-public class Model {
+public class Model implements Serializable{
-private Integer selectedImageIndex = 1;
+ private static final long serialVersionUID = -1767281809514660171L;
+ private Integer selectedImageIndex = 1;
private Image selectedImage;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/RegistrationManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -1,5 +1,7 @@
package org.richfaces.realworld.manager;
+import java.io.Serializable;
+
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -21,9 +23,10 @@
import org.richfaces.realworld.ui.PasswordHolder;
@Name("registerManager")
-(a)Scope(ScopeType.CONVERSATION)
-public class RegistrationManager {
-
+(a)Scope(ScopeType.EVENT)
+public class RegistrationManager implements Serializable{
+
+ private static final long serialVersionUID = -1767281809514660171L;
@In("#{messages['user.exist']}") private String USER_WITH_THIS_LOGIN_ALREADY_EXIST;
@In("#{messages['user.confirm.error']}") private String CONFIRM_PASSWORD_NOT_EQUALS_PASSWORD;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -31,6 +31,7 @@
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.Album;
@@ -61,12 +62,13 @@
@In
User user;
- //TODO nick - rename to createShelf
+ @Restrict("#{s:hasRole('admin')}")
public void createShelf() {
Shelf shelf = new Shelf();
Contexts.getConversationContext().set("shelf", shelf);
}
+ @Restrict("#{s:hasRole('admin')}")
public void addShelf(Shelf shelf) {
validationSuccess = true;
shelfAction.addShelf(shelf);
@@ -78,11 +80,13 @@
return user.getShelfs();
}
+ @Restrict("#{s:hasRole('admin')}")
public void editShelf(Shelf shelf) {
shelfAction.editShelf(shelf);
model.resetModel(NavigationEnum.SHELF_PREVIEW, model.getSelectedUser(), shelf, null, null);
}
+ @Restrict("#{s:hasRole('admin')}")
public void deleteShelf(Shelf shelf) {
//Update domain model
List<String> directoriesToDelete = new ArrayList<String>();
@@ -92,6 +96,7 @@
shelfAction.deleteShelf(shelf);
deleteDirectories(directoriesToDelete);
model.resetModel(NavigationEnum.ALL_SHELFS, model.getSelectedUser(), null, null, null);
+ Events.instance().raiseEvent("shelfDeleted");
Events.instance().raiseEvent("clearTree");
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -24,8 +24,11 @@
import java.util.List;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.core.Events;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.service.Constants;
@@ -36,9 +39,10 @@
private static final long serialVersionUID = 7801877176558409702L;
private Integer slideshowIndex;
private Image selectedImage;
- private List<Image> images;
private boolean active;
+ @In @Out Model model;
+
private int interval = Constants.INITIAL_DELAY;
public int getInterval() {
@@ -57,27 +61,32 @@
this.active = active;
}
- public void startSlideshow(List<Image> images){
+ public void startSlideshow(){
active = true;
- this.images = images;
this.slideshowIndex = 0;
- this.selectedImage = this.images.get(this.slideshowIndex);
- this.selectedImage.getAlbum().visitImage(selectedImage);
- this.selectedImage.getAlbum().getShelf().visitImage(selectedImage);
+ if(model.getImages() == null || model.getImages().size() < 1){
+ stopSlideshow();
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "No images for slideshow!");
+ return;
+ }
+ this.selectedImage = model.getImages().get(this.slideshowIndex);
+ this.selectedImage.getAlbum().visitImage(selectedImage, true);
}
- public void startSlideshow(List<Image> images, Image selectedImage){
+ public void startSlideshow(Image selectedImage){
active = true;
- this.images = images;
- this.slideshowIndex = images.indexOf(selectedImage);
+ if(model.getImages() == null || model.getImages().size() < 1){
+ stopSlideshow();
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "No images for slideshow!");
+ return;
+ }
+ this.slideshowIndex = model.getImages().indexOf(selectedImage);
this.selectedImage = selectedImage;
- this.selectedImage.getAlbum().visitImage(selectedImage);
- this.selectedImage.getAlbum().getShelf().visitImage(selectedImage);
+ this.selectedImage.getAlbum().visitImage(selectedImage, true);
}
public void stopSlideshow(){
active = false;
- this.images = null;
this.selectedImage = null;
this.slideshowIndex = 0;
}
@@ -97,26 +106,17 @@
public void setSelectedImage(Image selectedImage) {
this.selectedImage = selectedImage;
}
-
- public List<Image> getImages() {
- return images;
- }
-
- public void setImages(List<Image> images) {
- this.images = images;
- }
public void showNextImage(){
if(!active){
return;
}
- if(slideshowIndex == images.size() - 1){
+ if(slideshowIndex == model.getImages().size() - 1){
slideshowIndex = -1;
}
//TODO nick - this will start slideshow from the 2nd image (slideshowIndex == 1)
slideshowIndex++;
- selectedImage = images.get(slideshowIndex);
- this.selectedImage.getAlbum().visitImage(selectedImage);
- this.selectedImage.getAlbum().getShelf().visitImage(selectedImage);
+ selectedImage = model.getImages().get(slideshowIndex);
+ this.selectedImage.getAlbum().visitImage(selectedImage, true);
}
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -13,11 +13,9 @@
import org.richfaces.realworld.domain.User;
@Name("treeManager")
-(a)Scope(ScopeType.CONVERSATION)
+(a)Scope(ScopeType.EVENT)
public class TreeManager implements Serializable{
- @In
- private User user;
@In @Out Model model;
private static final long serialVersionUID = 5656562187249324512L;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -28,6 +28,7 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Observer;
+import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
@@ -35,23 +36,21 @@
import org.richfaces.realworld.service.IUserAction;
@Name("userManager")
-(a)Scope(ScopeType.CONVERSATION)
+(a)Scope(ScopeType.EVENT)
@AutoCreate
public class UserManager implements Serializable{
private static final long serialVersionUID = 6027103521084558931L;
- @In private User user;
-
- private Long countImages;
- private Long countAlbums;
+ @In(scope=ScopeType.CONVERSATION) @Out(scope=ScopeType.CONVERSATION) private User user;
+
@In private IUserAction userAction;
- public Long countImages(User u) {
- if(null == countImages ){
- countImages = userAction.countImages(u);
+ public Long countImages() {
+ if(null == user.getCountImages() ){
+ user.setCountImages(userAction.countImages());
}
- return countImages;
+ return user.getCountImages();
}
public Long countSharedImages(User u) {
@@ -59,14 +58,14 @@
}
public Long countSharedAlbums(User u) {
- return userAction.countSharedAlbums(user);
+ return userAction.countSharedAlbums(u);
}
- public Long countAlbums(User u) {
- if(null == countAlbums ){
- countAlbums = userAction.countAlbums(user);
+ public Long countAlbums() {
+ if(null == user.getCountAlbums() ){
+ user.setCountAlbums(userAction.countAlbums());
}
- return countAlbums;
+ return user.getCountAlbums();
}
public List<Album> getSharedAlbums(User user){
@@ -77,34 +76,29 @@
return userAction.getSharedImages(user);
}
- @Observer(value = "imageAdded", create = false)
+ @Observer(value = "imageAdded")
public void onImageAdded() {
- updateStatistics(countAlbums, countImages + 1);
+ user.updateStatistics();
}
- @Observer(value = "imageDeleted", create = false)
+ @Observer(value = "imageDeleted")
public void onImageDeleted(){
- updateStatistics(countAlbums, countImages - 1);
+ user.updateStatistics();
}
- @Observer(value = "albumDeleted", create = false)
+ @Observer(value = "albumDeleted")
public void onAlbumDeleted(){
- updateStatistics(countAlbums-1, countImages);
+ user.updateStatistics();
}
- @Observer(value = "albumAdded", create = false)
+ @Observer(value = "albumAdded")
public void onAlbumAdded(){
- updateStatistics(countAlbums+1, countImages);
+ user.updateStatistics();
}
-
- @Observer(value = "fileAdded", create = false)
- public void onFileAdded(){
- updateStatistics(countAlbums, countImages+1);
- }
- private void updateStatistics(Long i, Long j) {
- countAlbums = i;
- countImages = j;
+ @Observer(value = "shelfDeleted")
+ public void onShelfDeleted(){
+ user.updateStatistics();
}
-}
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -3,6 +3,7 @@
*/
package org.richfaces.realworld.search;
+import java.util.ArrayList;
import java.util.List;
import org.richfaces.realworld.service.ISearchAction;
@@ -20,11 +21,7 @@
public abstract String getName();
public abstract String getSearchResultName();
-
- public abstract String getTemplate();
- public abstract String getSearchResultTemplate();
-
public abstract void search(ISearchAction action, String searchQuery, boolean searchInMyAlbums, boolean searchInShared);
public boolean getSelected() {
@@ -40,6 +37,10 @@
return getName();
}
+ public String getSearchResultTemplate() {
+ return "/includes/search/result/albumsResult.xhtml";
+ }
+
public List<?> getSearchResult() {
return searchResult;
}
@@ -48,5 +49,4 @@
this.searchResult = searchResult;
}
-}
-
+}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -7,6 +7,7 @@
import java.util.List;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
@@ -18,6 +19,7 @@
@Name("searchImageHelper")
@Scope(ScopeType.CONVERSATION)
+@AutoCreate
public class ImageSearchHelper implements Serializable {
private static final long serialVersionUID = -304368268896942902L;
@@ -58,7 +60,6 @@
if (s.length() >= 2) {
s.delete(s.length() - 2, s.length());
}
- //TODO nick - remove trailing comma
return s.toString();
}
@@ -73,8 +74,6 @@
if (option.getSelected()) {
//TODO nick - use search(keyword)
option.search(searchAction, selectedKeyword , seachInMyAlbums, searchInShared);
- }else {
- option.setSearchResult(null);
}
}
}
@@ -86,8 +85,6 @@
ISearchOption option = it.next();
if (option.getSelected()) {
option.search(searchAction,selectedKeyword , seachInMyAlbums, searchInShared);
- }else {
- option.setSearchResult(null);
}
}
}
@@ -110,11 +107,6 @@
}
}
}
-
- @Out
- public String getTemplate() {
- return (isOptionSelected()) ? selectedOption.getTemplate() : "/includes/search/searchOptions.xhtml";
- }
public ISearchOption getSelectedOption() {
return selectedOption;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -1,9 +1,11 @@
package org.richfaces.realworld.search;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.service.ISearchAction;
@@ -12,7 +14,6 @@
Map<String, Object> params = new HashMap<String, Object>();
-
@Override
public String getName() {
return "Albums";
@@ -25,16 +26,15 @@
@Override
public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) {
- List<Image> searchByAlbum = action.searchByAlbum(q, searchInMyAlbums, searchInShared);
- setSearchResult(searchByAlbum);
+ List<Album> searchByAlbum = action.searchByAlbum(q, searchInMyAlbums, searchInShared);
+ if(searchByAlbum != null){
+ setSearchResult(searchByAlbum);
+ }else{
+ setSearchResult(new ArrayList<Album>());
+ }
}
@Override
- public String getTemplate() {
- return "/includes/search/searchByAlbumTemplate.xhtml";
- }
-
- @Override
public String getSearchResultTemplate() {
return "/includes/search/result/albumsResult.xhtml";
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -3,6 +3,7 @@
*/
package org.richfaces.realworld.search;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,16 +34,12 @@
@Override
public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) {
List<Image> searchByImage = action.searchByImage(q, searchInMyAlbums, searchInShared);
- setSearchResult(searchByImage);
+ if(searchByImage != null){
+ setSearchResult(searchByImage);
+ }else{
+ setSearchResult(new ArrayList<Image>());
+ }
}
-
-
- /* (non-Javadoc)
- * @see org.richfaces.realworld.search.ISearchOption#getTemplate()
- */
- public String getTemplate() {
- return "/includes/search/searchByImageTemplate.xhtml";
- }
@Override
public String getSearchResultTemplate() {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByShelf.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByShelf.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByShelf.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -3,8 +3,10 @@
*/
package org.richfaces.realworld.search;
+import java.util.ArrayList;
import java.util.List;
+import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.domain.Shelf;
import org.richfaces.realworld.service.ISearchAction;
@@ -39,22 +41,17 @@
}
/* (non-Javadoc)
- * @see org.richfaces.realworld.search.ISearchOption#getTemplate()
- */
- @Override
- public String getTemplate() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
* @see org.richfaces.realworld.search.ISearchOption#search(org.richfaces.realworld.service.ISearchAction, java.lang.String, boolean, boolean)
*/
@Override
public void search(ISearchAction action, String searchQuery,
boolean searchInMyAlbums, boolean searchInShared) {
List<Shelf> list = action.searchByShelfs(searchQuery, searchInMyAlbums, searchInShared);
- setSearchResult(list);
+ if(list != null){
+ setSearchResult(list);
+ }else{
+ setSearchResult(new ArrayList<Shelf>());
+ }
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -3,9 +3,12 @@
*/
package org.richfaces.realworld.search;
+import java.util.ArrayList;
import java.util.List;
+import org.richfaces.realworld.domain.Album;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.MetaTag;
import org.richfaces.realworld.service.ISearchAction;
/**
@@ -39,22 +42,17 @@
}
/* (non-Javadoc)
- * @see org.richfaces.realworld.search.ISearchOption#getTemplate()
- */
- @Override
- public String getTemplate() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
* @see org.richfaces.realworld.search.ISearchOption#search(org.richfaces.realworld.service.ISearchAction, java.lang.String, boolean, boolean)
*/
@Override
public void search(ISearchAction action, String searchQuery,
boolean searchInMyAlbums, boolean searchInShared) {
- List<Image> searchByTags = action.searchByTags(searchQuery, searchInMyAlbums, searchInShared);
- setSearchResult(searchByTags);
+ List<MetaTag> searchByTags = action.searchByTags(searchQuery, searchInMyAlbums, searchInShared);
+ if(searchByTags != null){
+ setSearchResult(searchByTags);
+ }else{
+ setSearchResult(new ArrayList<MetaTag>());
+ }
}
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -3,9 +3,12 @@
*/
package org.richfaces.realworld.search;
+import java.util.ArrayList;
import java.util.List;
import org.richfaces.realworld.domain.Image;
+import org.richfaces.realworld.domain.MetaTag;
+import org.richfaces.realworld.domain.User;
import org.richfaces.realworld.service.ISearchAction;
/**
@@ -39,20 +42,16 @@
}
/* (non-Javadoc)
- * @see org.richfaces.realworld.search.ISearchOption#getTemplate()
- */
- @Override
- public String getTemplate() {
- return null;
- }
-
- /* (non-Javadoc)
* @see org.richfaces.realworld.search.ISearchOption#search(org.richfaces.realworld.service.ISearchAction)
*/
@Override
public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) {
- List<Image> searchByUsers = action.searchByUsers(q, searchInMyAlbums, searchInShared);
- setSearchResult(searchByUsers);
+ List<User> searchByUsers = action.searchByUsers(q, searchInMyAlbums, searchInShared);
+ if(searchByUsers != null){
+ setSearchResult(searchByUsers);
+ }else{
+ setSearchResult(new ArrayList<User>());
+ }
}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ConfirmationPopupHelper.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -44,13 +44,13 @@
private String actionName;
- @In(create=true, required=true) @Out(required=false)
+ @In @Out(required=false)
private Image image;
- @In(create=true, required=true) @Out(required=false)
+ @In @Out(required=false)
private Shelf shelf;
- @In(create=true, required=true) @Out(required=false)
+ @In @Out(required=false)
private Album album;
@In AlbumManager albumManager;
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileItem.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileItem.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileItem.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -1,83 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package org.richfaces.realworld.ui;
-
-import java.io.File;
-
-import org.richfaces.realworld.domain.Image;
-
-//TODO nick - no references - dead class?
-public class FileItem {
-
- private Image image = new Image();
-
- private boolean selected;
-
- private long length;
-
- private byte[] data;
-
- private File file;
-
- private String name;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public byte[] getData() {
- return data;
- }
- public void setData(byte[] data) {
- this.data = data;
- }
-
- public long getLength() {
- return length;
- }
- public void setLength(long length) {
- this.length = length;
- }
-
- public boolean isSelected() {
- return selected;
- }
-
- public void setSelected(boolean selected) {
- this.selected = selected;
- }
-
- public Image getImage() {
- return image;
- }
-
- public void setImage(Image image) {
- this.image = image;
- }
- public File getFile() {
- return file;
- }
- public void setFile(File file) {
- this.file = file;
- }
-}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileUploadBean.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileUploadBean.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileUploadBean.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -33,6 +33,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
import org.richfaces.event.UploadEvent;
import org.richfaces.model.UploadItem;
@@ -58,7 +59,7 @@
*
*/
@Name("fileUploadBean")
-(a)Scope(ScopeType.CONVERSATION)
+(a)Scope(ScopeType.EVENT)
public class FileUploadBean implements Serializable {
@In("#{messages['file_processing_error']}")
@@ -82,21 +83,22 @@
private static final long serialVersionUID = 4969087557225414955L;
+ @Restrict("#{s:hasRole('admin')}")
public synchronized void listener(UploadEvent event) throws Exception {
UploadItem item = event.getUploadItem();
Image image = constructImage(item);
try {
extractMetadata(item, image);
} catch (JpegProcessingException e1) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, FILE_PROCESSING_ERROR);
return;
} catch (MetadataException me) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, FILE_PROCESSING_ERROR);
return;
}
image.setAlbum(model.getSelectedAlbum());
if(model.getSelectedAlbum() == null){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("Please specify album to download"));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "Please specify album to download");
return;
}
String newPath = "/" +model.getSelectedAlbum().getOwner().getLogin() + "/" + model.getSelectedAlbum().getId() + "/" +item.getFileName();
@@ -104,7 +106,7 @@
//TODO nick - file manager should be protected from another users accessing images of another people
if(!fileManager.addImage(newPath, item.getFile().getPath())){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_SAVE_ERROR));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, FILE_SAVE_ERROR);
item.getFile().delete();
return;
}
@@ -113,8 +115,6 @@
imageAction.addImage(image);
Events.instance().raiseEvent("imageAdded");
item.getFile().delete();
- image.getAlbum().getUnvisitedImages().add(image);
- image.getAlbum().getShelf().getUnvisitedImages().add(image);
}
private Image constructImage(UploadItem item) {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/FileWrapper.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -20,6 +20,7 @@
*/
package org.richfaces.realworld.ui;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -33,8 +34,9 @@
@Name("fileWrapper")
@Scope(ScopeType.SESSION)
@AutoCreate
-public class FileWrapper {
+public class FileWrapper implements Serializable{
+ private static final long serialVersionUID = -1767281809514660171L;
private List<Image> files = new ArrayList<Image>();
public int getSize() {
return getFiles().size();
@@ -48,6 +50,11 @@
this.files = files;
}
+ @Observer("DNDUploadedEvent")
+ public void removeImage(Image image){
+ files.remove(image);
+ }
+
@Observer("clearFileUpload")
public void clear(){
files.clear();
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageSizeHelper.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -12,7 +12,7 @@
*
*/
@Name("imageSizeHelper")
-(a)Scope(ScopeType.CONVERSATION)
+(a)Scope(ScopeType.EVENT)
public class ImageSizeHelper {
static final int DEFAULT_VALUE = 120;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/UserPrefsHelper.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -4,6 +4,8 @@
package org.richfaces.realworld.ui;
import java.io.File;
+import java.io.Serializable;
+import java.util.List;
import javax.faces.model.SelectItem;
@@ -12,6 +14,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
import org.richfaces.event.UploadEvent;
import org.richfaces.model.UploadItem;
@@ -30,8 +33,9 @@
*/
@Name("userPrefsBean")
@Scope(ScopeType.SESSION)
-public class UserPrefsHelper {
-
+public class UserPrefsHelper implements Serializable{
+
+ private static final long serialVersionUID = -1767281809514660171L;
@In IUserAction userAction;
@In FileManager fileManager;
@In @Out Model model;
@@ -41,22 +45,23 @@
File avatarData = null;
- static final SelectItem [] sexs = new SelectItem []
- {
- new SelectItem(Sex.MALE, "Male"),
- new SelectItem(Sex.FEMALE, "Female")
- };
+ static final Sex[] sexs = Sex.values();
+ public static Sex[] getSexs() {
+ return sexs;
+ }
+
public void uploadAvatar(UploadEvent event) {
UploadItem item = event.getUploadItem();
avatarData = item.getFile();
}
+ @Restrict("#{s:hasRole('admin')}")
//TODO nick - are we saving current user?
public void saveUser(){
if (avatarData != null) {
if(!fileManager.saveAvatar(avatarData.getPath(), user)){
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("File IO Error"));
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, "File IO Error");
return;
}
avatarData.delete();
@@ -70,15 +75,13 @@
public String goToIndex(){
return "index";
}
+
+ @Restrict("#{s:hasRole('admin')}")
public void cancel() {
user = userAction.resetUser();
avatarData = null;
model.resetModel(NavigationEnum.ALL_SHELFS, user, model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage());
}
-
- public SelectItem [] getSexs () {
- return sexs;
- }
public Boolean getAvatarModalOpened() {
return avatarModalOpened;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/DirectLinkHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/DirectLinkHelper.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/DirectLinkHelper.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -1,107 +1,38 @@
package org.richfaces.realworld.util;
-import java.awt.image.BufferedImage;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.imageio.ImageIO;
import javax.persistence.EntityManager;
-import javax.servlet.http.HttpServletRequest;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.web.RequestParameter;
-import org.jboss.seam.core.Events;
import org.jboss.seam.security.Identity;
import org.richfaces.realworld.domain.Image;
-import org.richfaces.realworld.manager.FileManager;
-import org.richfaces.realworld.service.Constants;
@Name("directLink")
@Scope(ScopeType.EVENT)
@AutoCreate
-//TODO nick - session-scoped bean depending on request parameters? i'm in doubts...
public class DirectLinkHelper {
@In(value="entityManager")
protected EntityManager em;
- @In(create = true)
- FileManager fileManager;
+ @In ImageLoader imageLoader;
+
@In Identity identity;
- private static final String IMAGE_DIRECT_LINK = "/includes/directImage.seam?imageId=";
-
- private static String imageDirectLinkPrefix;
-
public synchronized void paintImage(OutputStream out, Object data)
throws IOException {
Long id=Long.valueOf(data.toString());
Image im = em.find(Image.class, id);
//TODO nick - '&&' so only admins can see their own unshared images?
if(im.getAlbum().getShelf().isShared() || (identity.hasRole("admin") && im.getAlbum().getOwner().getLogin().equals(identity.getUsername()))){
- //TODO nick - copy-pasted 99% from ImageLoader
- File imageResource = fileManager.getImage(im.getPath());
- if (imageResource != null) {
- FileInputStream fileInputStream = new FileInputStream(imageResource);
- BufferedInputStream bufferedInputStream = new BufferedInputStream(
- fileInputStream);
- InputStream paintData = bufferedInputStream;
- if (null == paintData) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT,
- new Exception(""));
- return;
- }
- try {
- BufferedImage images = ImageIO.read(paintData);
- ImageIO.write(images, Constants.JPEG, out);
- } catch (Exception e) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT,
- new Exception(""));
- return;
- } finally {
- fileInputStream.close();
- bufferedInputStream.close();
- paintData.close();
- }
- }
+ imageLoader.paintImage(out, im.getPath());
}else{
return;
}
}
-
- public String getDirectImageLink(Image image) {
- if (imageDirectLinkPrefix == null) {
- FacesContext context = FacesContext.getCurrentInstance();
- if (context == null) {
- return null;
- }
- ExternalContext extc = context.getExternalContext();
- if (extc == null) {
- return null;
- }
-
- //TODO nick - see org.ajax4jsf.renderkit.RendererUtils#encodeResourceURL(TemplateContext, Object)
- Object request = extc.getRequest();
-
- if (request instanceof HttpServletRequest) {
- HttpServletRequest servletRequest = (HttpServletRequest)request;
- String contextPath = servletRequest.getContextPath();
- StringBuffer url = servletRequest.getRequestURL();
- int i = url.indexOf(contextPath);
- if (i > 0) {
- imageDirectLinkPrefix = url.substring(0, i) + contextPath + IMAGE_DIRECT_LINK;
- }
- }
- }
- return imageDirectLinkPrefix + image.getId();
- }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ErrorHandlerBean.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ErrorHandlerBean.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ErrorHandlerBean.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -37,15 +37,11 @@
@Scope(ScopeType.EVENT)
@AutoCreate
public class ErrorHandlerBean {
- private List<Exception> errors = new ArrayList<Exception>();
+ private List<String> errors = new ArrayList<String>();
- public List<Exception> getErrors() {
+ public List<String> getErrors() {
return errors;
}
-
- public void setErrors(List<Exception> errors) {
- this.errors = errors;
- }
public boolean isErrorExist(){
return errors.size() > 0 ;
@@ -57,7 +53,7 @@
}
@Observer(Constants.ADD_ERROR_EVENT)
- public void addToErrors(Exception e){
+ public void addToErrors(String e){
FacesContext context = FacesContext.getCurrentInstance();
AjaxContext ac = AjaxContext.getCurrentInstance(context);
//TODO nick - should add to AjaxContext#getAjaxAreasToRender()
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileManagerTest.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileManagerTest.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/FileManagerTest.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -1,137 +0,0 @@
-package org.richfaces.realworld.util;
-
-import junit.framework.TestCase;
-
-import org.richfaces.realworld.manager.FileManager;
-
-//TODO nick - test should be moved to src\main\test
-//TODO nick - test doesn't pass
-public class FileManagerTest extends TestCase {
-
- protected void setUp() throws Exception {
- fileManager=new FileManager();
- fileManager.setUploadRoot("C:/Upload/");
- }
-
- protected void tearDown() throws Exception {
- }
-
-private byte[] image = new byte[40];
- private FileManager fileManager;
- public void testIsDirectoryPresent() {
- fileManager.addDirectory("amarkhel");
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), true);
- assertEquals(fileManager.isDirectoryPresent("amarkhel2"), false);
- fileManager.deleteDirectory("amarkhel");
- }
-
- public void testDeleteDirectory() {
- fileManager.addDirectory("amarkhel");
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), true);
- fileManager.deleteDirectory("amarkhel");
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), false);
- }
-
- public void testRenameDirectory() throws Exception {
- fileManager.addDirectory("amarkhel");
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), true);
- fileManager.renameDirectory("amarkhel", "amarkhel2");
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), false);
- assertEquals(fileManager.isDirectoryPresent("amarkhel2"), true);
- fileManager.deleteDirectory("amarkhel2");
- }
-
- public void testRenameDirectory2(){
- fileManager.addDirectory("amarkhel");
- fileManager.addDirectory("amarkhel2");
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), true);
- try {
- fileManager.renameDirectory("amarkhel", "amarkhel2");
- } catch (Exception e) {
- assertTrue(true);
- }
-
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), true);
- assertEquals(fileManager.isDirectoryPresent("amarkhel2"), true);
- fileManager.deleteDirectory("amarkhel");
- fileManager.deleteDirectory("amarkhel2");
- }
-
- public void testRenameDirectory3() throws Exception {
- fileManager.addDirectory("a"+System.getProperty("file.separator")+"amarkhel");
- assertEquals(fileManager.isDirectoryPresent("a"+System.getProperty("file.separator")+"amarkhel"), true);
- fileManager.renameDirectory("a"+System.getProperty("file.separator")+"amarkhel", "b"+System.getProperty("file.separator")+"amarkhel");
- assertEquals(fileManager.isDirectoryPresent("a"+System.getProperty("file.separator")+"amarkhel"), false);
- assertEquals(fileManager.isDirectoryPresent("b"+System.getProperty("file.separator")+"amarkhel"), true);
- fileManager.deleteDirectory("b"+System.getProperty("file.separator")+"amarkhel");
- }
-
- public void testRenameDirectory4() throws Exception {
- fileManager.addDirectory("a"+System.getProperty("file.separator")+"a"+System.getProperty("file.separator")+"amarkhel");
- assertEquals(fileManager.isDirectoryPresent("a"+System.getProperty("file.separator")+"a"+System.getProperty("file.separator")+"amarkhel"), true);
- fileManager.renameDirectory("a"+System.getProperty("file.separator")+"a"+System.getProperty("file.separator")+"amarkhel", "b"+System.getProperty("file.separator")+"b"+System.getProperty("file.separator")+"amarkhel");
- assertEquals(fileManager.isDirectoryPresent("a"+System.getProperty("file.separator")+"a"+System.getProperty("file.separator")+"amarkhel"), false);
- assertEquals(fileManager.isDirectoryPresent("b"+System.getProperty("file.separator")+"b"+System.getProperty("file.separator")+"amarkhel"), true);
- fileManager.deleteDirectory("b"+System.getProperty("file.separator")+"b"+System.getProperty("file.separator")+"amarkhel");
- }
-
- public void testAddDirectory() {
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), false);
- fileManager.addDirectory("amarkhel");
- assertEquals(fileManager.isDirectoryPresent("amarkhel"), true);
- fileManager.deleteDirectory("amarkhel");
- }
-
- public void testAddDirectory2() {
- assertEquals(fileManager.isDirectoryPresent("a"+System.getProperty("file.separator")+"amarkhel"), false);
- fileManager.addDirectory("a"+System.getProperty("file.separator")+"amarkhel");
- assertEquals(fileManager.isDirectoryPresent("a"+System.getProperty("file.separator")+"amarkhel"), true);
- fileManager.deleteDirectory("a"+System.getProperty("file.separator")+"amarkhel");
- }
-
- /*public void testAddImage() throws IOException {
- assertEquals(fileManager.isImagePresent("amarkhel.gif"), false);
- fileManager.addImage("amarkhel.gif", image);
- assertEquals(fileManager.isImagePresent("amarkhel.gif"), true);
- fileManager.deleteImage("amarkhel.gif");
- }
-
- public void testDeleteImage() throws IOException {
- fileManager.addImage("amarkhel.gif", image);
- assertEquals(fileManager.isImagePresent("amarkhel.gif"), true);
- fileManager.deleteImage("amarkhel.gif");
- assertEquals(fileManager.isImagePresent("amarkhel.gif"), false);
- }
-
- public void testRenameImage() throws IOException {
- fileManager.addImage("amarkhel.gif", image);
- assertEquals(fileManager.isImagePresent("amarkhel.gif"), true);
- fileManager.renameImage("amarkhel.gif", "amarkhel2.gif");
- assertEquals(fileManager.isImagePresent("amarkhel.gif"), false);
- assertEquals(fileManager.isImagePresent("amarkhel2.gif"), true);
- fileManager.deleteImage("amarkhel2.gif");
- }
-
- public void testRenameImage2() throws IOException {
- fileManager.addImage("a"+System.getProperty("file.separator")+"amarkhel.gif", image);
- assertEquals(fileManager.isImagePresent("a"+System.getProperty("file.separator")+"amarkhel.gif"), true);
- fileManager.renameImage("a"+System.getProperty("file.separator")+"amarkhel.gif", "b"+System.getProperty("file.separator")+"amarkhel2.gif");
- assertEquals(fileManager.isImagePresent("a"+System.getProperty("file.separator")+"amarkhel.gif"), false);
- assertEquals(fileManager.isImagePresent("b"+System.getProperty("file.separator")+"amarkhel2.gif"), true);
- fileManager.deleteImage("b"+System.getProperty("file.separator")+"amarkhel2.gif");
- fileManager.deleteDirectory("b");
- fileManager.deleteDirectory("a");
- }
-
- public void testIsImagePresent() throws IOException {
- fileManager.addImage("amarkhel.gif", image);
- assertEquals(fileManager.isImagePresent("amarkhel.gif"), true);
- assertEquals(fileManager.isImagePresent("amarkhel3.gif"), false);
- fileManager.deleteImage("amarkhel.gif");
- fileManager.addImage("am"+System.getProperty("file.separator")+"amarkhel.gif", image);
- assertEquals(fileManager.isImagePresent("am"+System.getProperty("file.separator")+"amarkhel.gif"), true);
- fileManager.deleteImage("am"+System.getProperty("file.separator")+"amarkhel.gif");
- fileManager.deleteDirectory("am");
- }*/
-
-}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/Help.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/Help.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/Help.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -6,11 +6,11 @@
import org.jboss.seam.annotations.Scope;
@Name("help")
-(a)Scope(ScopeType.CONVERSATION)
+(a)Scope(ScopeType.EVENT)
@AutoCreate
public class Help {
- private String page;
+ private String page = "/includes/help/tree_click_descr.xhtml";
public String getPage() {
return page;
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ImageLoader.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -32,6 +32,7 @@
import javax.imageio.ImageIO;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@@ -40,8 +41,8 @@
import org.richfaces.realworld.service.Constants;
@Name("imageLoader")
-(a)Scope(ScopeType.CONVERSATION)
-//TODO nick - why is this conversation-scoped?
+(a)Scope(ScopeType.EVENT)
+@AutoCreate
public class ImageLoader implements Serializable {
private static final long serialVersionUID = -1572789608594870285L;
@@ -53,64 +54,25 @@
//TODO nick - synchronized would make this a bottleneck, especially considering that this method
// consumes plenty of CPU time
- public synchronized void paintImage(OutputStream out, Object data) throws IOException {
+ public void paintImage(OutputStream out, Object data) throws IOException {
if (null == data) {
return;
}
- File imageResource = fileManager.getImage(data.toString());
+ File imageResource = fileManager.getFileByPath(data.toString());
if (imageResource != null) {
FileInputStream fileInputStream = new FileInputStream(imageResource);
BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
InputStream paintData = bufferedInputStream;
- //TODO nick - paintData is never null
- if (null == paintData) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
- return;
- }
try {
//TODO nick - pass-through writing will save us large amount of CPU time and images quality
BufferedImage images = ImageIO.read(paintData);
ImageIO.write(images, Constants.JPEG, out);
} catch (Exception e) {
//TODO nick - any particular reason to catch not to take the whole method body into try/catch?
- //TODO nick - how useful is new Exception(...)? why not use just String?
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
- //TODO nick - that's not necessary at all
- return;
+ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, FILE_PROCESSING_ERROR);
} finally {
- //TODO nick - calling bufferedInputStream.close() is enough
- fileInputStream.close();
bufferedInputStream.close();
- paintData.close();
}
}
}
-
- //TODO nick - this is copy-pasted 99% from paintImage()
- public synchronized void paintImageFromFile(OutputStream out, Object data) throws IOException {
- if (null == data) {
- return;
- }
- File imageResource = fileManager.getImageFile(data.toString());
- if (imageResource != null) {
- FileInputStream fileInputStream = new FileInputStream(imageResource);
- BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream);
- InputStream paintData = bufferedInputStream;
- if (null == paintData) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
- return;
- }
- try {
- BufferedImage images = ImageIO.read(paintData);
- ImageIO.write(images, Constants.JPEG, out);
- } catch (Exception e) {
- Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(FILE_PROCESSING_ERROR));
- return;
- } finally {
- fileInputStream.close();
- bufferedInputStream.close();
- paintData.close();
- }
- }
- }
}
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/test.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/test.java 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/test.java 2009-04-03 13:32:44 UTC (rev 13375)
@@ -1,195 +0,0 @@
-package org.richfaces.realworld.util;
-
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.Transparency;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.ImageInputStream;
-
-//TODO nick - delete this class
-public class test {
-// private static String directory = "E:\\realworldnew\\web\\src\\main\\webapp\\WEB-INF\\Upload\\Viking\\15";
- private static String directory = "E:\\temp\\out_images\\";
-
- public static void main(String[] args) throws IOException {
- if (args.length > 0 && args[0] != null) {
- directory = args[0];
- }
-
- File file = new File(directory);
- writeFiles(file, "_small80", 80);
- writeFiles(file, "_small120", 120);
- writeFiles(file, "_small160", 160);
- writeFiles(file, "_small200", 200);
- writeFiles(file, "_mini", 150);
- writeFiles(file, "_medium", 600);
- }
-
- private static void writeFiles(File file, String pattern, int size) {
- if (file.isDirectory()) {
- for (File subFile : file.listFiles()){
- writeFiles(subFile, pattern, size);
- }
- } else if (file.isFile()) {
- final String s = file.getName().toLowerCase();
- if (s.endsWith(".jpg") && !s.endsWith("_mini.jpg") && !s.endsWith("_medium.jpg")
- && !s.endsWith("_small80.jpg") && !s.endsWith("_small120.jpg")
- && !s.endsWith("_small160.jpg") && !s.endsWith("_small200.jpg")) {
- System.out.println("processing file >> " + file.getPath());
- writeOneImage(file.getParent(), pattern, size, s);
- }
- } else {
- throw new IllegalArgumentException("Unknow file type");
- }
- }
-
- private static void writeOneImage(String directory, String pattern, int size, String s) {
- BufferedImage bsrc;
- try {
- bsrc = bitmapToImage(directory + "\\" + s, "JPG");
- } catch (IOException e1) {
- e1.printStackTrace();
- return;
- }
-
- int i = bsrc.getWidth() > bsrc.getHeight() ? bsrc.getWidth() : bsrc.getHeight();
- double d = ((double) size) / i;
- Double yy = d * bsrc.getWidth();
- int width = yy.intValue();
- yy = d * bsrc.getHeight();
- int height = yy.intValue();
- BufferedImage bdest = getScaledInstance(bsrc, width, height, RenderingHints.VALUE_INTERPOLATION_BICUBIC, true);
- String dest = transformPath(directory + "\\" + s, pattern);
-
- try {
- imageToBitmap(bdest, dest, "JPG");
- } catch (IOException ex) {
- ex.printStackTrace();
- }
- }
-
- private static String transformPath(String target, String substitute) {
- String begin = target.substring(0, target.lastIndexOf("."));
- String end = target.substring(target.lastIndexOf("."));
- return begin + substitute + end;
- }
-
-/* private static void generateTags() {
- try {
- BufferedWriter out = new BufferedWriter(new FileWriter("C:\\1114.txt"));
- //String a ="INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES ("+commentId+", '1985-01-08', 'Hello I am user',"+ imageId+", 2);\n"+ "INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES ("+commentId2+", '1985-01-08', 'Hello I am user2',"+ imageId+", 3);\n";
-
- //out.write("INSERT INTO IMAGES_METATAGS(CI_IMAGE_ID, CI_METATAG_ID) VALUES("+"1"+"," +"1"+ ");\n");
- for (int i = 2; i < 84; i++) {
- String imageId = (new Integer(i)).toString();
- String commentId = (new Integer(i * 2 - 1)).toString();
- String commentId2 = (new Integer(i * 2)).toString();
- out.append("INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (" + commentId + ", '1985-01-08', 'Hello I am user'," + imageId + ", 2);\n" + "INSERT INTO comments(comment_id, date, message, image_comment_id, from_user_id) VALUES (" + commentId2 + ", '1985-01-08', 'Hello I am user2'," + imageId + ", 3);\n");
- }
- out.close();
- } catch (IOException e) {
- // Do nothing.
- }
-
- }*/
-
- public static BufferedImage bitmapToImage(String data, String format) throws IOException {
- InputStream inb = new FileInputStream(data);
- ImageReader rdr = ImageIO.getImageReadersByFormatName(format).next();
- ImageInputStream imageInput = ImageIO.createImageInputStream(inb);
- rdr.setInput(imageInput);
- BufferedImage image = rdr.read(0);
- inb.close();
- return image;
- }
-
- public static void imageToBitmap(BufferedImage image, String data, String format) throws IOException {
- OutputStream inb = new FileOutputStream(data);
- ImageWriter wrt = ImageIO.getImageWritersByFormatName(format).next();
- ImageInputStream imageInput = ImageIO.createImageOutputStream(inb);
- wrt.setOutput(imageInput);
- wrt.write(image);
- inb.close();
- }
-
- /**
- * Convenience method that returns a scaled instance of the
- * provided {@code BufferedImage}.
- *
- * @param img the original image to be scaled
- * @param targetWidth the desired width of the scaled instance,
- * in pixels
- * @param targetHeight the desired height of the scaled instance,
- * in pixels
- * @param hint one of the rendering hints that corresponds to
- * {@code RenderingHints.KEY_INTERPOLATION} (e.g.
- * {@code RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR},
- * {@code RenderingHints.VALUE_INTERPOLATION_BILINEAR},
- * {@code RenderingHints.VALUE_INTERPOLATION_BICUBIC})
- * @param higherQuality if true, this method will use a multi-step
- * scaling technique that provides higher quality than the usual
- * one-step technique (only useful in downscaling cases, where
- * {@code targetWidth} or {@code targetHeight} is
- * smaller than the original dimensions, and generally only when
- * the {@code BILINEAR} hint is specified)
- * @return a scaled version of the original {@code BufferedImage}
- */
- public static BufferedImage getScaledInstance(BufferedImage img,
- int targetWidth,
- int targetHeight,
- Object hint,
- boolean higherQuality) {
- int type = (img.getTransparency() == Transparency.OPAQUE) ?
- BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
- BufferedImage ret = img;
- int w, h;
- if (higherQuality) {
- // Use multi-step technique: start with original size, then
- // scale down in multiple passes with drawImage()
- // until the target size is reached
- w = img.getWidth();
- h = img.getHeight();
- } else {
- // Use one-step technique: scale directly from original
- // size to target size with a single drawImage() call
- w = targetWidth;
- h = targetHeight;
- }
-
- do {
- if (higherQuality && w > targetWidth) {
- w /= 2;
- if (w < targetWidth) {
- w = targetWidth;
- }
- }
-
- if (higherQuality && h > targetHeight) {
- h /= 2;
- if (h < targetHeight) {
- h = targetHeight;
- }
- }
-
- BufferedImage tmp = new BufferedImage(w, h, type);
- Graphics2D g2 = tmp.createGraphics();
- g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, hint);
- g2.drawImage(ret, 0, 0, w, h, null);
- g2.dispose();
-
- ret = tmp;
- } while (w != targetWidth || h != targetHeight);
-
- return ret;
- }
-}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/pages.xml 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/pages.xml 2009-04-03 13:32:44 UTC (rev 13375)
@@ -9,7 +9,7 @@
<redirect view-id="/register.xhtml"/>
</rule>
<rule if-outcome="main">
- <redirect view-id="/main.xhtml"/>
+ <redirect view-id="/index.xhtml"/>
</rule>
<rule if-outcome="index">
<redirect view-id="/index.html"/>
@@ -19,7 +19,7 @@
<page view-id="/index.xhtml">
<begin-conversation if="#{!identity.isLoggedIn()}"/>
- <action if="#{authenticator.startConversation!=null}" execute="#{authenticator.startConversation}"/>
+ <action if="#{authenticator.startConversation!=null}" execute="#{authenticator.startConversation()}"/>
<action if="#{!identity.isLoggedIn()}" execute="#{authenticator.start}"/>
<navigation from-action="#{authenticator.logout}">
<rule if-outcome="logout">
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-04-03 13:32:44 UTC (rev 13375)
@@ -5,22 +5,6 @@
<facelet-taglib>
<namespace>http://richfaces.org/richx</namespace>
<tag>
- <tag-name>album</tag-name>
- <source>templates/album.xhtml</source>
- </tag>
- <tag>
- <tag-name>shelf</tag-name>
- <source>templates/shelf.xhtml</source>
- </tag>
- <tag>
- <tag-name>help</tag-name>
- <source>templates/help.xhtml</source>
- </tag>
- <tag>
- <tag-name>confirm</tag-name>
- <source>templates/confirmation.xhtml</source>
- </tag>
- <tag>
<tag-name>commandButton</tag-name>
<component>
<component-type>org.ajax4jsf.CommandButton</component-type>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumsList.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/directImage.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/imageAdditionalInfo.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/image/slideshow.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/imageEdit.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/menu.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/tree.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/confirmation.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/confirmation.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/errorPanel.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/inputNumberSlider.xhtml 2009-04-03 13:32:44 UTC (rev 13375)
@@ -14,7 +14,7 @@
showBoundaryValues="true"
showInput="false"
step="40">
- <a4j:support event="onchange" reRender="#{reRenderArea}"></a4j:support>
+ <a4j:support event="onchange" reRender="userAlbumImages"/>
</rich:inputNumberSlider>
</div>
</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/modalPanels.xhtml
===================================================================
(Binary files differ)
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-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-04-03 13:32:44 UTC (rev 13375)
@@ -5,12 +5,13 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
<a4j:outputPanel rendered="#{result.size() > 0}" id="imagesList">
-
+ <rich:datascroller for="imageList" reRender="userAlbumImages"></rich:datascroller>
<ui:include src="/includes/misc/inputNumberSlider.xhtml">
<ui:param name="reRenderArea" value="imagesList" />
</ui:include>
<br/><br/>
- <a4j:repeat value="#{result}" var="image">
+ <h:panelGroup id="userAlbumImages">
+ <a4j:repeat id="imageList" value="#{result}" var="image" rows="20">
<h:panelGroup layout="block" styleClass="#{imageSizeHelper.currentDimension.cssClass}">
<h:graphicImage styleClass="pr_photo_bg" value="#{imageSizeHelper.currentDimension.imageBg}" />
<h:panelGrid cellpadding="0">
@@ -39,6 +40,7 @@
</h:panelGroup>
</h:panelGroup>
</a4j:repeat>
+ </h:panelGroup>
</a4j:outputPanel>
<h:outputText rendered="#{result.size() == 0}" value="No results found" />
</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-04-03 13:32:44 UTC (rev 13375)
@@ -4,31 +4,31 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
- <a4j:repeat rendered="#{result.size() > 0}" id="userList" value="#{result}" var="user">
+ <a4j:repeat rendered="#{result.size() > 0}" id="userList" value="#{result}" var="searchedUser">
<h:panelGroup layout="block" styleClass="preview_box_photo_120">
<h:graphicImage styleClass="pr_photo_bg" value="/img/shell/frame_photo_200.png" style="border:none"/>
<h:panelGrid cellpadding="0">
<h:panelGroup>
- <a4j:commandLink reRender="mainArea" actionListener="#{controller.showUser(user)}">
- <a4j:mediaOutput rendered="#{user.hasAvatar}" element="img" createContent="#{imageLoader.paintImage}"
+ <a4j:commandLink reRender="mainArea" actionListener="#{controller.showUser(searchedUser)}">
+ <a4j:mediaOutput rendered="#{searchedUser.hasAvatar}" element="img" createContent="#{imageLoader.paintImage}"
styleClass="avatar"
- value="/#{user.login}/avatar.jpg" />
- <h:graphicImage rendered="#{!user.hasAvatar and user.sex.key =='1' }" value="/img/shell/avatar_default.png" width="80" height="80" alt="" style="border:none"/>
- <h:graphicImage rendered="#{!user.hasAvatar and user.sex.key =='0' }" value="/img/shell/avatar_w_default.png" width="80" height="80" alt="" style="border:none"/>
+ value="/#{searchedUser.login}/avatar.jpg" />
+ <h:graphicImage rendered="#{!searchedUser.hasAvatar and searchedUser.sex.key =='1' }" value="/img/shell/avatar_default.png" width="80" height="80" alt="" style="border:none"/>
+ <h:graphicImage rendered="#{!searchedUser.hasAvatar and searchedUser.sex.key =='0' }" value="/img/shell/avatar_w_default.png" width="80" height="80" alt="" style="border:none"/>
</a4j:commandLink>
<br/>
</h:panelGroup>
</h:panelGrid>
<h:panelGroup layout="block" styleClass="photo_name">
- <strong>#{user.firstName} #{user.secondName}</strong>
+ <strong>#{searchedUser.firstName} #{searchedUser.secondName}</strong>
</h:panelGroup>
<h:panelGroup layout="block" styleClass="photo_data">
- <h:outputText value="#{user.birthDate}" >
+ <h:outputText value="#{searchedUser.birthDate}" >
<f:convertDateTime />
</h:outputText>
</h:panelGroup>
<h:panelGroup layout="block" styleClass="photo_data">
- <a4j:commandLink reRender="tree, mainArea" actionListener="#{controller.showSharedAlbums(user)}" ><h:outputText value="#{userManager.countSharedAlbums(user)} albums "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(user)}"><h:outputText value="#{userManager.countSharedImages(user)} photos"/></a4j:commandLink>
+ <a4j:commandLink reRender="tree, mainArea" actionListener="#{controller.showSharedAlbums(searchedUser)}" ><h:outputText value="#{userManager.countSharedAlbums(searchedUser)} albums "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(searchedUser)}"><h:outputText value="#{userManager.countSharedImages(searchedUser)} photos"/></a4j:commandLink>
</h:panelGroup>
</h:panelGroup>
</a4j:repeat>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/createShelf.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/createShelf.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tag.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/avatar.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/avatar.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefs.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/userPrefsEdit.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/main.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js 2009-04-03 13:17:38 UTC (rev 13374)
+++ trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js 2009-04-03 13:32:44 UTC (rev 13375)
@@ -1,40 +1,3 @@
-function selectAllFiles(f) {
- for (var i = 0; i < filesCount; i++) {
- var b = $('mainform:files:'+i+':file_selected');
- if (b) {
- b.checked = f;
- }
-
- }
-}
-
-function onselectFileClick(el) {
- if (!el.checked) {
- $('select_all').checked = false;
- }else {
- var b = true;
- for (var i = 0; i < filesCount; i++) {
- var d = $('mainform:files:'+i+':file_selected');
- if (!d.checked) {
- b = false;
- break;
- }
- }
- if (b) {
- $('select_all').checked = true;
- }
-
- }
-}
-
-function SearchPanelShowHide(e, elt) {
- if (Element.visible(elt)) {
- hideSearch();
- }else {
- showSearch();
- }
-}
-
function selectPopularTag(tag, target) {
if(target){
var value = target.value;
15 years, 1 month
JBoss Rich Faces SVN: r13374 - trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-03 09:17:38 -0400 (Fri, 03 Apr 2009)
New Revision: 13374
Modified:
trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
Log:
Debugger keyword removed
Modified: trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2009-04-03 12:41:52 UTC (rev 13373)
+++ trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2009-04-03 13:17:38 UTC (rev 13374)
@@ -1535,8 +1535,6 @@
Element.removeClassName(this.id+":anchor","rich-menu-item-label-selected");
Element.removeClassName(this.id+":icon","rich-menu-group-icon-selected");
Element.removeClassName(this.id+":anchor","rich-menu-group-label-selected");
- } else {
- debugger;
}
}
}
15 years, 1 month
JBoss Rich Faces SVN: r13373 - trunk/test-applications/realworld2.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-03 08:41:52 -0400 (Fri, 03 Apr 2009)
New Revision: 13373
Modified:
trunk/test-applications/realworld2/pom.xml
Log:
Exadel repository removed from realworld POM
Modified: trunk/test-applications/realworld2/pom.xml
===================================================================
--- trunk/test-applications/realworld2/pom.xml 2009-04-03 00:35:54 UTC (rev 13372)
+++ trunk/test-applications/realworld2/pom.xml 2009-04-03 12:41:52 UTC (rev 13373)
@@ -27,11 +27,6 @@
<name>Jboss Repository for Maven</name>
<url>http://repository.jboss.com/maven2/</url>
</repository>
- <repository>
- <id>repository.exadel.com</id>
- <name>Exadel Maven 2 Repository</name>
- <url>http://repository.exadel.com/</url>
- </repository>
</repositories>
<modules>
<module>ear</module>
15 years, 1 month
JBoss Rich Faces SVN: r13372 - in trunk: framework/jsf-test/src/main/java/org/richfaces/test/staging and 6 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2009-04-02 20:35:54 -0400 (Thu, 02 Apr 2009)
New Revision: 13372
Added:
trunk/samples/themes/src/main/config/component/theme1.xml
trunk/samples/themes/src/main/config/component/theme2.xml
trunk/samples/themes/src/main/config/faces/.faces-config.xml.jsfdia
trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx
trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java.cp1251
Modified:
trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java
trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java
trunk/samples/themes/src/main/config/faces/faces-config.xml
trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java
trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java
trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
Log:
Lex's pages have been converted into renderer templates.
Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java
===================================================================
--- trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2009-04-02 23:02:16 UTC (rev 13371)
+++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/AbstractFacesTest.java 2009-04-03 00:35:54 UTC (rev 13372)
@@ -6,12 +6,14 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.EventListener;
import java.util.Locale;
import java.util.Properties;
import java.util.logging.LogManager;
+import javax.faces.FacesException;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
import javax.faces.application.ApplicationFactory;
@@ -255,8 +257,24 @@
* @throws Exception
*/
protected void setupFacesRequest() throws Exception {
+ String url = "http://localhost/test.jsf";
+ setupFacesRequest(url);
+ UIViewRoot viewRoot = setupView();
+ if (null != viewRoot) {
+ facesContext.setViewRoot(viewRoot);
+ }
+ }
+
+ /**
+ * <p class="changed_added_2_0"></p>
+ * @param url
+ * @throws MalformedURLException
+ * @throws FacesException
+ */
+ protected void setupFacesRequest(String url) throws MalformedURLException,
+ FacesException {
connection = facesServer.getConnection(new URL(
- "http://localhost/test.jsf"));
+ url));
setupConnection();
connection.start();
FacesContextFactory facesContextFactory = (FacesContextFactory) FactoryFinder
@@ -264,10 +282,6 @@
facesContext = facesContextFactory.getFacesContext(facesServer
.getContext(), connection.getRequest(), connection
.getResponse(), lifecycle);
- UIViewRoot viewRoot = setupView();
- if (null != viewRoot) {
- facesContext.setViewRoot(viewRoot);
- }
}
/**
Modified: trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java
===================================================================
--- trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2009-04-02 23:02:16 UTC (rev 13371)
+++ trunk/framework/jsf-test/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2009-04-03 00:35:54 UTC (rev 13372)
@@ -178,6 +178,10 @@
public Set getResourcePaths(String path) {
HashSet result=null;
ServerResource resource = getServerResource(path);
+ if(null == resource && !path.endsWith("/")){
+ path+="/";
+ resource = getServerResource(path);
+ }
if(null != resource){
Set<String> paths = resource.getPaths();
if(null != paths && paths.size()>0){
Added: trunk/samples/themes/src/main/config/component/theme1.xml
===================================================================
--- trunk/samples/themes/src/main/config/component/theme1.xml (rev 0)
+++ trunk/samples/themes/src/main/config/component/theme1.xml 2009-04-03 00:35:54 UTC (rev 13372)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd">
+
+<components>
+ <renderer generate="true" override="true">
+ <name>org.richfaces.Theme1Renderer</name>
+ <template>org/richfaces/theme1.jspx</template>
+ </renderer>
+</components>
\ No newline at end of file
Property changes on: trunk/samples/themes/src/main/config/component/theme1.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/config/component/theme2.xml
===================================================================
--- trunk/samples/themes/src/main/config/component/theme2.xml (rev 0)
+++ trunk/samples/themes/src/main/config/component/theme2.xml 2009-04-03 00:35:54 UTC (rev 13372)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://labs.jboss.com/jbossrichfaces/component-config.dtd">
+
+<components>
+ <renderer generate="true" override="true">
+ <name>org.richfaces.Theme2Renderer</name>
+ <template>org/richfaces/theme2.jspx</template>
+ </renderer>
+</components>
\ No newline at end of file
Property changes on: trunk/samples/themes/src/main/config/component/theme2.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/config/faces/.faces-config.xml.jsfdia
===================================================================
--- trunk/samples/themes/src/main/config/faces/.faces-config.xml.jsfdia (rev 0)
+++ trunk/samples/themes/src/main/config/faces/.faces-config.xml.jsfdia 2009-04-03 00:35:54 UTC (rev 13372)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Modified: trunk/samples/themes/src/main/config/faces/faces-config.xml
===================================================================
--- trunk/samples/themes/src/main/config/faces/faces-config.xml 2009-04-02 23:02:16 UTC (rev 13371)
+++ trunk/samples/themes/src/main/config/faces/faces-config.xml 2009-04-03 00:35:54 UTC (rev 13372)
@@ -14,5 +14,15 @@
<renderer-type>org.richfaces.VioletRaysRenderer</renderer-type>
<renderer-class>org.richfaces.renderkit.html.VioletRaysRenderer</renderer-class>
</renderer>
+ <renderer>
+ <component-family>org.richfaces.Page</component-family>
+ <renderer-type>org.richfaces.Theme1Renderer</renderer-type>
+ <renderer-class>org.richfaces.renderkit.html.Theme1Renderer</renderer-class>
+ </renderer>
+ <renderer>
+ <component-family>org.richfaces.Page</component-family>
+ <renderer-type>org.richfaces.Theme2Renderer</renderer-type>
+ <renderer-class>org.richfaces.renderkit.html.Theme2Renderer</renderer-class>
+ </renderer>
</render-kit>
</faces-config>
\ No newline at end of file
Added: trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx
===================================================================
--- trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx (rev 0)
+++ trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx 2009-04-03 00:35:54 UTC (rev 13372)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root
+ xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c=" http://java.sun.com/jsf/core"
+ xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+ xmlns:u=" http://ajax4jsf.org/cdk/u"
+ xmlns:x=" http://ajax4jsf.org/cdk/x"
+ xmlns:h="http://jsf.exadel.com/header"
+ xmlns:vcp="http://ajax4jsf.org/cdk/vcp"
+ class="org.richfaces.renderkit.html.Theme1Renderer"
+ baseclass="org.richfaces.renderkit.AbstractPageRenderer"
+ component="org.richfaces.component.UIPage"
+ >
+ <c:set var="namespace" value="#{this:prolog(context,component)}"/>
+ <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}"
+ >
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>#{component.attributes['pageTitle']}</title>
+ <f:call name="themeStyle"/>
+ <f:call name="themeScript"/>
+ <u:insertFacet name="pageHeader"/>
+
+</head>
+<body x:passThruWithExclusions="value,name,type,id">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td align="center" class="common_box">
+
+ <table height="100%" border="0" cellpadding="0" cellspacing="0" class="page_size">
+ <tr>
+ <td colspan="3" class="header_bg_left">
+ <div class="header_bg_right">
+ <div class="spacer" style="height : 15px"></div>
+ <div class="header_content">
+ <u:insertFacet name="header"/>
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="left_col">
+ <div class="left_strut">
+ <br />
+ </div>
+ </td>
+ <td width="100%" height="100%" class="bg_tabbody">
+ <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <tr>
+ <td class="menu_col">
+ <div class="menu_width spacer"></div>
+ <u:insertFacet name="sidebar"/>
+ </td>
+ <td class="content_col">
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="right_col">
+ <div class="right_strut">
+ <br />
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="footer_bg_left">
+ <div class="footer_bg_right">
+ <div class="footer_bg_content">
+ <u:insertFacet name="footer"/>
+
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ </td>
+ </tr>
+</table>
+</body>
+</html>
+</f:root>
\ No newline at end of file
Property changes on: trunk/samples/themes/src/main/templates/org/richfaces/theme1.jspx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
===================================================================
--- trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx (rev 0)
+++ trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx 2009-04-03 00:35:54 UTC (rev 13372)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root
+ xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c=" http://java.sun.com/jsf/core"
+ xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+ xmlns:u=" http://ajax4jsf.org/cdk/u"
+ xmlns:x=" http://ajax4jsf.org/cdk/x"
+ xmlns:h="http://jsf.exadel.com/header"
+ xmlns:vcp="http://ajax4jsf.org/cdk/vcp"
+ class="org.richfaces.renderkit.html.Theme2Renderer"
+ baseclass="org.richfaces.renderkit.AbstractPageRenderer"
+ component="org.richfaces.component.UIPage"
+ >
+ <c:set var="namespace" value="#{this:prolog(context,component)}"/>
+ <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}"
+ >
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>#{component.attributes['pageTitle']}</title>
+ <f:call name="themeStyle"/>
+ <f:call name="themeScript"/>
+ <u:insertFacet name="pageHeader"/>
+
+</head>
+<body x:passThruWithExclusions="value,name,type,id">
+ <table border="0" cellpadding="0" cellspacing="0" class="page_size">
+ <tr>
+ <td class="header_bg">
+ <div class="header_content">
+<!-- begin header -->
+ <u:insertFacet name="header"/>
+<!-- end header -->
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td width="100%" height="100%" class="bg_tabbody">
+ <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
+ <tr>
+ <td class="menu_col">
+ <div class="menu_width spacer"></div>
+<!-- begin menu -->
+ <u:insertFacet name="sidebar"/>
+<!-- end meny -->
+ </td>
+ <td class="content_col">
+<!-- begin content -->
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
+<!-- end content -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="footer_bg">
+ <div class="footer_bg_content">
+<!-- begin footer -->
+ <u:insertFacet name="footer"/>
+<!-- end footer -->
+ </div>
+ </td>
+ </tr>
+ </table>
+</body>
+</html>
+</f:root>
\ No newline at end of file
Property changes on: trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java
===================================================================
--- trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java 2009-04-02 23:02:16 UTC (rev 13371)
+++ trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java 2009-04-03 00:35:54 UTC (rev 13372)
@@ -1,759 +1,759 @@
-package org.richfaces.seamparser;
-
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
-import junit.framework.TestCase;
-import org.jboss.seam.text.SeamTextLexer;
-import org.jboss.seam.text.SeamTextParser;
-import org.richfaces.convert.seamtext.HtmlToSeamSAXParser;
-
-import java.io.StringReader;
-
-/**
- * @user: akolonitsky
- * Date: Mar 25, 2009
- */
-public class HtmlSeamParserTest extends TestCase {
-
-
- private final static String SEAM_TEXT_EXPRESSION_1 = "It's easy to make *emphasis* -1- *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_.";
-
- private final static String SEAM_TEXT_EXPRESSION_2 = "+ This is a big heading\n"
- + "You /must/ have some text following a heading!\n\n"
- + "++ This is a smaller heading\n"
- + "This is the first paragraph. We can split it across multiple"
- + "lines, but we must end it with a blank line.\n\n"
- + "This is the second paragraph.";
-
- private final static String SEAM_TEXT_EXPRESSION_3 = "An ordered list:\n\n"
- + "# first item\n" + "# second item\n"
- + "# and even the /third/ item\n\n" + "An unordered list:\n\n"
- + "= an item\n" + "= another item";
-
- private final static String SEAM_TEXT_EXPRESSION_4 = "The other guy said: " + "\"Nyeah nyeah-nee\"";
-
- private final static String SEAM_TEXT_EXPRESSION_5 =
- "You can write down equations like 2\\*3\\+4-7\\=3 and HTML tagslike \\<body\\> using the escape character: \\\\. foo(a)tut.by, 100$ cash 100%";
-
- private final static String SEAM_TEXT_EXPRESSION_6 = "My code doesn't work:"
- + "`for (int i=0; i<100; i--)\n"
- + "{\n"
- + "doSomething(){ String str = \"& >" \"; }; doSomething();\n"
- + "doSomething() " +
- "}`" + " Any ideas?";
-
- private final static String SEAM_TEXT_EXPRESSION_7 = "+ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
-
- private final static String SEAM_TEXT_EXPRESSION_8 = "++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
-
- private final static String SEAM_TEXT_EXPRESSION_9 = "+++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
-
- private final static String SEAM_TEXT_EXPRESSION_10 = "++++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
-
- private final static String SEAM_TEXT_EXPRESSION_11 = "+ test value<div>test5</div><h1>test1<div>test2</div>test4</h1>\ntest";
-
- private final static String SEAM_TEXT_EXPRESSION_12 = "[test link=>http://test.com]";
-
- private final static String SEAM_TEXT_EXPRESSION_13 = "[=>http://test.com]";
-
- private final static String SEAM_TEXT_EXPRESSION_14 = "This is a |<tag attribute=\"value\"/>| example.";
-
- private final static String SEAM_TEXT_EXPRESSION_15 = "= <div class=\"testClass1 testClass2\"></div><h1> test value </h1>";
-
- private final static String SEAM_TEXT_EXPRESSION_16 = "# <div class=\"testClass1 testClass2\"></div><h1> test value </h1>";
-
- private final static String SEAM_TEXT_EXPRESSION_17 = "paragraph\n\n+ header\ntext after header\n\nanother paragraph";
-
- private final static String SEAM_TEXT_EXPRESSION_18 = "paragraph\n\n++ header\ntext after header\n\nanother paragraph";
-
- private final static String SEAM_TEXT_EXPRESSION_19 = "paragraph\n\n+++ header\ntext after header\n\nanother paragraph";
-
- private final static String SEAM_TEXT_EXPRESSION_20 = "paragraph\n\n++++ header\ntext after header\n\nanother paragraph";
-
- private final static String SEAM_TEXT_EXPRESSION_21 = "paragraph\n\n= item1\n= item2\n= item3\n\nanother paragraph";
-
- private final static String SEAM_TEXT_EXPRESSION_22 = "paragraph\n\n# item1\n# item2\n# item3\n\nanother paragraph";
-
- private final static String SEAM_TEXT_EXPRESSION_23 = "+ header text *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_";
-
- private final static String SEAM_TEXT_EXPRESSION_24 = "++ header text *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_";
-
- private final static String SEAM_TEXT_EXPRESSION_25 = "+++ header text *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_";
-
- private final static String SEAM_TEXT_EXPRESSION_26 = "++++ header text *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_";
-
-
- private final static String SEAM_TEXT_EXPRESSION_27 = "= item1 *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_\n= item2 *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_";
-
- private final static String SEAM_TEXT_EXPRESSION_28 = "# item1 *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_\n# item2 *emphasis*, |monospace|, "
- + "~deleted text~, super^scripts^ or_underlines_";
-
- private final static String SEAM_TEXT_EXPRESSION_29 = "A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9";
-
- public HtmlSeamParserTest(String name) {
- super(name);
- }
-
- public void testSeamTextConverting1() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_1);
- }
-
- public void testStandartSeamTextConverting2() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_2);
- }
-
- public void testStandartSeamTextConverting3() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_3);
- }
-
- public void testStandartSeamTextConverting4() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_4);
- }
-
- public void testStandartSeamTextConverting5() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_5);
- }
-
- public void testStandartSeamTextConverting6() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_6);
- }
-
- public void testStandartSeamTextConverting7() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_7);
- }
-
- public void testStandartSeamTextConverting8() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_8);
- }
-
- public void testStandartSeamTextConverting9() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_9);
- }
-
- public void testStandartSeamTextConverting10() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_10);
- }
-
- public void testStandartSeamTextConverting11() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_11);
- }
-
- public void testStandartSeamTextConverting12() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_12);
- }
-
- public void testStandartSeamTextConverting13() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_13);
- }
-
- public void testStandartSeamTextConverting14() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_14);
- }
-
- public void testStandartSeamTextConverting15() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_15);
- }
-
- public void testStandartSeamTextConverting16() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_16);
- }
-
- public void testStandartSeamTextConverting17() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_17);
- }
-
-
- public void testStandartSeamTextConverting18() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_18);
- }
-
- public void testStandartSeamTextConverting19() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_19);
- }
-
- public void testStandartSeamTextConverting20() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_20);
- }
-
- public void testStandartSeamTextConverting21() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_21);
- }
-
- public void testStandartSeamTextConverting22() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_22);
- }
-
- public void testStandartSeamTextConverting23() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_23);
- }
-
- public void testStandartSeamTextConverting24() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_24);
- }
-
- public void testStandartSeamTextConverting25() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_25);
- }
-
- public void testStandartSeamTextConverting26() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_26);
- }
-
- public void testStandartSeamTextConverting27() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_27);
- }
-
- public void testStandartSeamTextConverting28() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_28);
- }
-
- public void testStandartSeamTextConverting29() throws Exception {
- assertSeamConverting(SEAM_TEXT_EXPRESSION_29);
- }
-
- public void testRF5717() throws Exception {
- assertHtml2SeamConverting("<p>a<b a&b</p>");
- }
-
- public void testNestingFormating() throws Exception {
- assertHtml2SeamConverting("<p><b>aaaaaaaaa <u><i class=\"seamTextEmphasis\">sssssssss</i> dddddddddddddddd</u></b></p>");
- }
-
- public void testNestingFormating1() throws Exception {
- assertHtml2SeamConverting("<P><STRONG>aaaaaaaaad <U><B>ddddddddddddd</B> sssssssssssss</U></STRONG></P>");
- }
-
- public void testSkipComment() throws Exception {
- assertHtml2SeamConverting("<!-- Hello Cfif -->");
- }
-
- public void testUglyTextFromWord() throws Exception {
- final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>" +
- "<!--[if gte mso 9]><xml>\n" +
- " <w:WordDocument>\n" +
- " <w:View>Normal</w:View>\n" +
- " <w:Zoom>0</w:Zoom>\n" +
- " <w:TrackMoves/>\n" +
- " <w:TrackFormatting/>\n" +
- " <w:PunctuationKerning/>\n" +
- " <w:ValidateAgainstSchemas/>\n" +
- " <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>\n" +
- " <w:IgnoreMixedContent>false</w:IgnoreMixedContent>\n" +
- " <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>\n" +
- " <w:DoNotPromoteQF/>\n" +
- " <w:LidThemeOther>EN-US</w:LidThemeOther>\n" +
- " <w:LidThemeAsian>X-NONE</w:LidThemeAsian>\n" +
- " <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>\n" +
- " <w:Compatibility>\n" +
- " <w:BreakWrappedTables/>\n" +
- " <w:SnapToGridInCell/>\n" +
- " <w:WrapTextWithPunct/>\n" +
- " <w:UseAsianBreakRules/>\n" +
- " <w:DontGrowAutofit/>\n" +
- " <w:SplitPgBreakAndParaMark/>\n" +
- " <w:DontVertAlignCellWithSp/>\n" +
- " <w:DontBreakConstrainedForcedTables/>\n" +
- " <w:DontVertAlignInTxbx/>\n" +
- " <w:Word11KerningPairs/>\n" +
- " <w:CachedColBalance/>\n" +
- " </w:Compatibility>\n" +
- " <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>\n" +
- " <m:mathPr>\n" +
- " <m:mathFont m:val=\"Cambria Math\"/>\n" +
- " <m:brkBin m:val=\"before\"/>\n" +
- " <m:brkBinSub m:val=\"-\"/>\n" +
- " <m:smallFrac m:val=\"off\"/>\n" +
- " <m:dispDef/>\n" +
- " <m:lMargin m:val=\"0\"/>\n" +
- " <m:rMargin m:val=\"0\"/>\n" +
- " <m:defJc m:val=\"centerGroup\"/>\n" +
- " <m:wrapIndent m:val=\"1440\"/>\n" +
- " <m:intLim m:val=\"subSup\"/>\n" +
- " <m:naryLim m:val=\"undOvr\"/>\n" +
- " </m:mathPr></w:WordDocument>\n" +
- "</xml><![endif]-->" +
- "<!--[if gte mso 9]><xml>\n" +
- " <w:LatentStyles DefLockedState=\"false\" DefUnhideWhenUsed=\"true\"\n" +
- " DefSemiHidden=\"true\" DefQFormat=\"false\" DefPriority=\"99\"\n" +
- " LatentStyleCount=\"267\">\n" +
- " <w:LsdException Locked=\"false\" Priority=\"0\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Normal\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"heading 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 7\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 8\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 9\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 7\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 8\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 9\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"35\" QFormat=\"true\" Name=\"caption\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"10\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Title\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"1\" Name=\"Default Paragraph Font\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"11\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtitle\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"22\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Strong\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"20\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Emphasis\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"59\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Table Grid\"/>\n" +
- " <w:LsdException Locked=\"false\" UnhideWhenUsed=\"false\" Name=\"Placeholder Text\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"1\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"No Spacing\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" UnhideWhenUsed=\"false\" Name=\"Revision\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"34\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"List Paragraph\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"29\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Quote\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"30\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Quote\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 1\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 2\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 3\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 4\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 5\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light List Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 6\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"19\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtle Emphasis\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"21\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Emphasis\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"31\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtle Reference\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"32\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Reference\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"33\" SemiHidden=\"false\"\n" +
- " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Book Title\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"37\" Name=\"Bibliography\"/>\n" +
- " <w:LsdException Locked=\"false\" Priority=\"39\" QFormat=\"true\" Name=\"TOC Heading\"/>\n" +
- " </w:LatentStyles>\n" +
- "</xml><![endif]" +
- "-->" +
- "<style>\n" +
- "<!--\n" +
- " /* Font Definitions */\n" +
- " @font-face\n" +
- "\t{font-family:\"Cambria Math\";\n" +
- "\tpanose-1:2 4 5 3 5 4 6 3 2 4;\n" +
- "\tmso-font-charset:204;\n" +
- "\tmso-generic-font-family:roman;\n" +
- "\tmso-font-pitch:variable;\n" +
- "\tmso-font-signature:-1610611985 1107304683 0 0 159 0;}\n" +
- "@font-face\n" +
- "\t{font-family:Calibri;\n" +
- "\tpanose-1:2 15 5 2 2 2 4 3 2 4;\n" +
- "\tmso-font-charset:204;\n" +
- "\tmso-generic-font-family:swiss;\n" +
- "\tmso-font-pitch:variable;\n" +
- "\tmso-font-signature:-1610611985 1073750139 0 0 159 0;}\n" +
- " /* Style Definitions */\n" +
- " p.MsoNormal, li.MsoNormal, div.MsoNormal\n" +
- "\t{mso-style-unhide:no;\n" +
- "\tmso-style-qformat:yes;\n" +
- "\tmso-style-parent:\"\";\n" +
- "\tmargin-top:0in;\n" +
- "\tmargin-right:0in;\n" +
- "\tmargin-bottom:10.0pt;\n" +
- "\tmargin-left:0in;\n" +
- "\tline-height:115%;\n" +
- "\tmso-pagination:widow-orphan;\n" +
- "\tfont-size:11.0pt;\n" +
- "\tfont-family:\"Calibri\",\"sans-serif\";\n" +
- "\tmso-ascii-font-family:Calibri;\n" +
- "\tmso-ascii-theme-font:minor-latin;\n" +
- "\tmso-fareast-font-family:Calibri;\n" +
- "\tmso-fareast-theme-font:minor-latin;\n" +
- "\tmso-hansi-font-family:Calibri;\n" +
- "\tmso-hansi-theme-font:minor-latin;\n" +
- "\tmso-bidi-font-family:\"Times New Roman\";\n" +
- "\tmso-bidi-theme-font:minor-bidi;}\n" +
- "a:link, span.MsoHyperlink\n" +
- "\t{mso-style-noshow:yes;\n" +
- "\tmso-style-priority:99;\n" +
- "\tcolor:blue;\n" +
- "\ttext-decoration:underline;\n" +
- "\ttext-underline:single;}\n" +
- "a:visited, span.MsoHyperlinkFollowed\n" +
- "\t{mso-style-noshow:yes;\n" +
- "\tmso-style-priority:99;\n" +
- "\tcolor:purple;\n" +
- "\tmso-themecolor:followedhyperlink;\n" +
- "\ttext-decoration:underline;\n" +
- "\ttext-underline:single;}\n" +
- "p\n" +
- "\t{mso-style-noshow:yes;\n" +
- "\tmso-style-priority:99;\n" +
- "\tmso-margin-top-alt:auto;\n" +
- "\tmargin-right:0in;\n" +
- "\tmargin-bottom:5.75pt;\n" +
- "\tmargin-left:0in;\n" +
- "\tmso-pagination:widow-orphan;\n" +
- "\tfont-size:12.0pt;\n" +
- "\tfont-family:\"Times New Roman\",\"serif\";\n" +
- "\tmso-fareast-font-family:\"Times New Roman\";}\n" +
- ".MsoChpDefault\n" +
- "\t{mso-style-type:export-only;\n" +
- "\tmso-default-props:yes;\n" +
- "\tmso-ascii-font-family:Calibri;\n" +
- "\tmso-ascii-theme-font:minor-latin;\n" +
- "\tmso-fareast-font-family:Calibri;\n" +
- "\tmso-fareast-theme-font:minor-latin;\n" +
- "\tmso-hansi-font-family:Calibri;\n" +
- "\tmso-hansi-theme-font:minor-latin;\n" +
- "\tmso-bidi-font-family:\"Times New Roman\";\n" +
- "\tmso-bidi-theme-font:minor-bidi;}\n" +
- ".MsoPapDefault\n" +
- "\t{mso-style-type:export-only;\n" +
- "\tmargin-bottom:10.0pt;\n" +
- "\tline-height:115%;}\n" +
- "@page Section1\n" +
- "\t{size:595.3pt 841.9pt;\n" +
- "\tmargin:56.7pt 42.5pt 56.7pt 85.05pt;\n" +
- "\tmso-header-margin:.5in;\n" +
- "\tmso-footer-margin:.5in;\n" +
- "\tmso-paper-source:0;}\n" +
- "div.Section1\n" +
- "\t{page:Section1;}\n" +
- "-->\n" +
- "</style>" +
- "<!--[if gte mso 10]>\n" +
- "<style>\n" +
- " /* Style Definitions */\n" +
- " table.MsoNormalTable\n" +
- "\t{mso-style-name:\"?z?�N�N�???�N? N�?�?�?�??N�?�\";\n" +
- "\tmso-tstyle-rowband-size:0;\n" +
- "\tmso-tstyle-colband-size:0;\n" +
- "\tmso-style-noshow:yes;\n" +
- "\tmso-style-priority:99;\n" +
- "\tmso-style-qformat:yes;\n" +
- "\tmso-style-parent:\"\";\n" +
- "\tmso-padding-alt:0in 5.4pt 0in 5.4pt;\n" +
- "\tmso-para-margin-top:0in;\n" +
- "\tmso-para-margin-right:0in;\n" +
- "\tmso-para-margin-bottom:10.0pt;\n" +
- "\tmso-para-margin-left:0in;\n" +
- "\tline-height:115%;\n" +
- "\tmso-pagination:widow-orphan;\n" +
- "\tfont-size:11.0pt;\n" +
- "\tfont-family:\"Calibri\",\"sans-serif\";\n" +
- "\tmso-ascii-font-family:Calibri;\n" +
- "\tmso-ascii-theme-font:minor-latin;\n" +
- "\tmso-fareast-font-family:\"Times New Roman\";\n" +
- "\tmso-fareast-theme-font:minor-fareast;\n" +
- "\tmso-hansi-font-family:Calibri;\n" +
- "\tmso-hansi-theme-font:minor-latin;}\n" +
- "</style>\n" +
- "<![endif]" +
- "-->\n" +
- "\n" +
- "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><a name=\"OLE_LINK2\"/><a name=\"OLE_LINK1\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>We where\n" +
- "unsuccessful in reproducting this bug in our testing</span></b></span></a></p>\n" +
- "\n" +
- "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><span style=\"\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>environment.</span></b></span></span></p>\n" +
- "\n" +
- "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A�</o:p></span></span></p>\n" +
- "\n" +
- "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><s><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Could you provide us with a example URL\n" +
- "where this is happening?</span></s></span></span></p>\n" +
- "\n" +
- "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Do you have any odd browser\n" +
- "extensions/plugins installed?</span></span></span></p>\n" +
- "\n" +
- "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Does it happen on our site aswell </span></span></span><a href=\"http://tinymce.moxiecode.com/\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\";'>http://tinymce.moxiecode.com</span></span></span></a><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>?</span></span></span></p>\n" +
- "\n" +
- "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A�</o:p></span></span></p>\n" +
- "\n" +
- "<span style=\"\"/><span style=\"\"/>\n" +
- "\n" +
- "<p class=\"MsoNormal\"><o:p>A�</o:p></p>\n" +
- "\n" +
- "</p>";
- assertHtml2SeamConverting(str);
- }
-
- public void testTextFromOpenOffice() throws Exception {
- assertHtml2SeamConverting(
- "<p style=\"margin-bottom: 0in; line-height: 100%;\" >" +
- " <meta http-equiv=\"CONTENT-TYPE\" content=\"text/html;\" charset=\"utf-8\" />" +
- " <title></title>" +
- " <meta name=\"GENERATOR\" content=\"OpenOffice.org 3.0 (Win32)\" />" +
- " <style type=\"text/css\"><!--" +
- " <!" +
- " @page { margin: 0.79in }" +
- " P { margin-bottom: 0.08in }" +
- " >" +
- " --></style>" +
- "</p>" +
- "<p style=\"margin-bottom: 0in; line-height: 100%;\" " +
- " align=\"center\" " +
- " lang=\"en-US\">" +
- " <font color=\"#000000\">" +
- " <font color=\"#000001\">" +
- " <font color=\"#000002\" style=\"font-size: 20pt;\" size=\"5\">" +
- " <b>We where unsuccessful in reproducting this bug in our testing</b>" +
- " </font>" +
- " </font>" +
- " </font>" +
- "</p>" +
- "<p style=\"margin-bottom: 0in; line-height: 100%;\" " +
- " align=\"center\" " +
- " lang=\"en-US\">" +
- " <font color=\"#000000\">" +
- " <font>" +
- " <font style=\"font-size: 20pt;\" size=\"5\">" +
- " <b>environment.</b>" +
- " </font>" +
- " </font>" +
- " </font>" +
- "</p>");
- }
-
- private String assertHtml2SeamConverting(String htmlText)
- throws Exception {
-
- final String seamText = convertHtmlToSeamText(htmlText);
- System.out.println("seamText = \n" + seamText);
-
- final SeamTextParser seamParser = new SeamTextParser(
- new SeamTextLexer(new StringReader(seamText)));
- seamParser.startRule();
-
- return seamParser.toString();
- }
-
- private void assertSeamConverting(String seamTextExpression) throws TokenStreamException, RecognitionException {
-
- final SeamTextParser seamParser = new SeamTextParser(new SeamTextLexer(new StringReader(seamTextExpression)));
- seamParser.startRule();
- final String html = seamParser.toString();
- System.out.println("html = " + html);
-
- final String seamtext = convertHtmlToSeamText(html);
-
- assertEquals(seamTextExpression,seamtext.trim());
- }
-
- private String convertHtmlToSeamText(final String html) {
- try {
- return HtmlToSeamSAXParser.convertHtmlToSeamText(html);
- } catch (Exception e) {
- e.printStackTrace();
- assertTrue(false);
- }
-
- return null;
- }
-}
\ No newline at end of file
+package org.richfaces.seamparser;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+import junit.framework.TestCase;
+import org.jboss.seam.text.SeamTextLexer;
+import org.jboss.seam.text.SeamTextParser;
+import org.richfaces.convert.seamtext.HtmlToSeamSAXParser;
+
+import java.io.StringReader;
+
+/**
+ * @user: akolonitsky
+ * Date: Mar 25, 2009
+ */
+public class HtmlSeamParserTest extends TestCase {
+
+
+ private final static String SEAM_TEXT_EXPRESSION_1 = "It's easy to make *emphasis* -1- *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_.";
+
+ private final static String SEAM_TEXT_EXPRESSION_2 = "+ This is a big heading\n"
+ + "You /must/ have some text following a heading!\n\n"
+ + "++ This is a smaller heading\n"
+ + "This is the first paragraph. We can split it across multiple"
+ + "lines, but we must end it with a blank line.\n\n"
+ + "This is the second paragraph.";
+
+ private final static String SEAM_TEXT_EXPRESSION_3 = "An ordered list:\n\n"
+ + "# first item\n" + "# second item\n"
+ + "# and even the /third/ item\n\n" + "An unordered list:\n\n"
+ + "= an item\n" + "= another item";
+
+ private final static String SEAM_TEXT_EXPRESSION_4 = "The other guy said: " + "\"Nyeah nyeah-nee\"";
+
+ private final static String SEAM_TEXT_EXPRESSION_5 =
+ "You can write down equations like 2\\*3\\+4-7\\=3 and HTML tagslike \\<body\\> using the escape character: \\\\. foo(a)tut.by, 100$ cash 100%";
+
+ private final static String SEAM_TEXT_EXPRESSION_6 = "My code doesn't work:"
+ + "`for (int i=0; i<100; i--)\n"
+ + "{\n"
+ + "doSomething(){ String str = \"& >" \"; }; doSomething();\n"
+ + "doSomething() " +
+ "}`" + " Any ideas?";
+
+ private final static String SEAM_TEXT_EXPRESSION_7 = "+ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_8 = "++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_9 = "+++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_10 = "++++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_11 = "+ test value<div>test5</div><h1>test1<div>test2</div>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_12 = "[test link=>http://test.com]";
+
+ private final static String SEAM_TEXT_EXPRESSION_13 = "[=>http://test.com]";
+
+ private final static String SEAM_TEXT_EXPRESSION_14 = "This is a |<tag attribute=\"value\"/>| example.";
+
+ private final static String SEAM_TEXT_EXPRESSION_15 = "= <div class=\"testClass1 testClass2\"></div><h1> test value </h1>";
+
+ private final static String SEAM_TEXT_EXPRESSION_16 = "# <div class=\"testClass1 testClass2\"></div><h1> test value </h1>";
+
+ private final static String SEAM_TEXT_EXPRESSION_17 = "paragraph\n\n+ header\ntext after header\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_18 = "paragraph\n\n++ header\ntext after header\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_19 = "paragraph\n\n+++ header\ntext after header\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_20 = "paragraph\n\n++++ header\ntext after header\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_21 = "paragraph\n\n= item1\n= item2\n= item3\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_22 = "paragraph\n\n# item1\n# item2\n# item3\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_23 = "+ header text *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_24 = "++ header text *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_25 = "+++ header text *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_26 = "++++ header text *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+
+ private final static String SEAM_TEXT_EXPRESSION_27 = "= item1 *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n= item2 *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_28 = "# item1 *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n# item2 *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_29 = "A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9";
+
+ public HtmlSeamParserTest(String name) {
+ super(name);
+ }
+
+ public void testSeamTextConverting1() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_1);
+ }
+
+ public void testStandartSeamTextConverting2() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_2);
+ }
+
+ public void testStandartSeamTextConverting3() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_3);
+ }
+
+ public void testStandartSeamTextConverting4() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_4);
+ }
+
+ public void testStandartSeamTextConverting5() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_5);
+ }
+
+ public void testStandartSeamTextConverting6() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_6);
+ }
+
+ public void testStandartSeamTextConverting7() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_7);
+ }
+
+ public void testStandartSeamTextConverting8() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_8);
+ }
+
+ public void testStandartSeamTextConverting9() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_9);
+ }
+
+ public void testStandartSeamTextConverting10() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_10);
+ }
+
+ public void testStandartSeamTextConverting11() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_11);
+ }
+
+ public void testStandartSeamTextConverting12() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_12);
+ }
+
+ public void testStandartSeamTextConverting13() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_13);
+ }
+
+ public void testStandartSeamTextConverting14() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_14);
+ }
+
+ public void testStandartSeamTextConverting15() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_15);
+ }
+
+ public void testStandartSeamTextConverting16() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_16);
+ }
+
+ public void testStandartSeamTextConverting17() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_17);
+ }
+
+
+ public void testStandartSeamTextConverting18() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_18);
+ }
+
+ public void testStandartSeamTextConverting19() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_19);
+ }
+
+ public void testStandartSeamTextConverting20() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_20);
+ }
+
+ public void testStandartSeamTextConverting21() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_21);
+ }
+
+ public void testStandartSeamTextConverting22() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_22);
+ }
+
+ public void testStandartSeamTextConverting23() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_23);
+ }
+
+ public void testStandartSeamTextConverting24() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_24);
+ }
+
+ public void testStandartSeamTextConverting25() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_25);
+ }
+
+ public void testStandartSeamTextConverting26() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_26);
+ }
+
+ public void testStandartSeamTextConverting27() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_27);
+ }
+
+ public void testStandartSeamTextConverting28() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_28);
+ }
+
+ public void testStandartSeamTextConverting29() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_29);
+ }
+
+ public void testRF5717() throws Exception {
+ assertHtml2SeamConverting("<p>a<b a&b</p>");
+ }
+
+ public void testNestingFormating() throws Exception {
+ assertHtml2SeamConverting("<p><b>aaaaaaaaa <u><i class=\"seamTextEmphasis\">sssssssss</i> dddddddddddddddd</u></b></p>");
+ }
+
+ public void testNestingFormating1() throws Exception {
+ assertHtml2SeamConverting("<P><STRONG>aaaaaaaaad <U><B>ddddddddddddd</B> sssssssssssss</U></STRONG></P>");
+ }
+
+ public void testSkipComment() throws Exception {
+ assertHtml2SeamConverting("<!-- Hello Cfif -->");
+ }
+
+ public void testUglyTextFromWord() throws Exception {
+ final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>" +
+ "<!--[if gte mso 9]><xml>\n" +
+ " <w:WordDocument>\n" +
+ " <w:View>Normal</w:View>\n" +
+ " <w:Zoom>0</w:Zoom>\n" +
+ " <w:TrackMoves/>\n" +
+ " <w:TrackFormatting/>\n" +
+ " <w:PunctuationKerning/>\n" +
+ " <w:ValidateAgainstSchemas/>\n" +
+ " <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>\n" +
+ " <w:IgnoreMixedContent>false</w:IgnoreMixedContent>\n" +
+ " <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>\n" +
+ " <w:DoNotPromoteQF/>\n" +
+ " <w:LidThemeOther>EN-US</w:LidThemeOther>\n" +
+ " <w:LidThemeAsian>X-NONE</w:LidThemeAsian>\n" +
+ " <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>\n" +
+ " <w:Compatibility>\n" +
+ " <w:BreakWrappedTables/>\n" +
+ " <w:SnapToGridInCell/>\n" +
+ " <w:WrapTextWithPunct/>\n" +
+ " <w:UseAsianBreakRules/>\n" +
+ " <w:DontGrowAutofit/>\n" +
+ " <w:SplitPgBreakAndParaMark/>\n" +
+ " <w:DontVertAlignCellWithSp/>\n" +
+ " <w:DontBreakConstrainedForcedTables/>\n" +
+ " <w:DontVertAlignInTxbx/>\n" +
+ " <w:Word11KerningPairs/>\n" +
+ " <w:CachedColBalance/>\n" +
+ " </w:Compatibility>\n" +
+ " <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>\n" +
+ " <m:mathPr>\n" +
+ " <m:mathFont m:val=\"Cambria Math\"/>\n" +
+ " <m:brkBin m:val=\"before\"/>\n" +
+ " <m:brkBinSub m:val=\"-\"/>\n" +
+ " <m:smallFrac m:val=\"off\"/>\n" +
+ " <m:dispDef/>\n" +
+ " <m:lMargin m:val=\"0\"/>\n" +
+ " <m:rMargin m:val=\"0\"/>\n" +
+ " <m:defJc m:val=\"centerGroup\"/>\n" +
+ " <m:wrapIndent m:val=\"1440\"/>\n" +
+ " <m:intLim m:val=\"subSup\"/>\n" +
+ " <m:naryLim m:val=\"undOvr\"/>\n" +
+ " </m:mathPr></w:WordDocument>\n" +
+ "</xml><![endif]-->" +
+ "<!--[if gte mso 9]><xml>\n" +
+ " <w:LatentStyles DefLockedState=\"false\" DefUnhideWhenUsed=\"true\"\n" +
+ " DefSemiHidden=\"true\" DefQFormat=\"false\" DefPriority=\"99\"\n" +
+ " LatentStyleCount=\"267\">\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"0\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Normal\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"heading 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 7\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 8\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 9\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 7\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 8\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 9\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"35\" QFormat=\"true\" Name=\"caption\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"10\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Title\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"1\" Name=\"Default Paragraph Font\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"11\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtitle\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"22\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Strong\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"20\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Emphasis\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"59\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Table Grid\"/>\n" +
+ " <w:LsdException Locked=\"false\" UnhideWhenUsed=\"false\" Name=\"Placeholder Text\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"1\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"No Spacing\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" UnhideWhenUsed=\"false\" Name=\"Revision\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"34\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"List Paragraph\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"29\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Quote\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"30\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Quote\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"19\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtle Emphasis\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"21\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Emphasis\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"31\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtle Reference\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"32\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Reference\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"33\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Book Title\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"37\" Name=\"Bibliography\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" QFormat=\"true\" Name=\"TOC Heading\"/>\n" +
+ " </w:LatentStyles>\n" +
+ "</xml><![endif]" +
+ "-->" +
+ "<style>\n" +
+ "<!--\n" +
+ " /* Font Definitions */\n" +
+ " @font-face\n" +
+ "\t{font-family:\"Cambria Math\";\n" +
+ "\tpanose-1:2 4 5 3 5 4 6 3 2 4;\n" +
+ "\tmso-font-charset:204;\n" +
+ "\tmso-generic-font-family:roman;\n" +
+ "\tmso-font-pitch:variable;\n" +
+ "\tmso-font-signature:-1610611985 1107304683 0 0 159 0;}\n" +
+ "@font-face\n" +
+ "\t{font-family:Calibri;\n" +
+ "\tpanose-1:2 15 5 2 2 2 4 3 2 4;\n" +
+ "\tmso-font-charset:204;\n" +
+ "\tmso-generic-font-family:swiss;\n" +
+ "\tmso-font-pitch:variable;\n" +
+ "\tmso-font-signature:-1610611985 1073750139 0 0 159 0;}\n" +
+ " /* Style Definitions */\n" +
+ " p.MsoNormal, li.MsoNormal, div.MsoNormal\n" +
+ "\t{mso-style-unhide:no;\n" +
+ "\tmso-style-qformat:yes;\n" +
+ "\tmso-style-parent:\"\";\n" +
+ "\tmargin-top:0in;\n" +
+ "\tmargin-right:0in;\n" +
+ "\tmargin-bottom:10.0pt;\n" +
+ "\tmargin-left:0in;\n" +
+ "\tline-height:115%;\n" +
+ "\tmso-pagination:widow-orphan;\n" +
+ "\tfont-size:11.0pt;\n" +
+ "\tfont-family:\"Calibri\",\"sans-serif\";\n" +
+ "\tmso-ascii-font-family:Calibri;\n" +
+ "\tmso-ascii-theme-font:minor-latin;\n" +
+ "\tmso-fareast-font-family:Calibri;\n" +
+ "\tmso-fareast-theme-font:minor-latin;\n" +
+ "\tmso-hansi-font-family:Calibri;\n" +
+ "\tmso-hansi-theme-font:minor-latin;\n" +
+ "\tmso-bidi-font-family:\"Times New Roman\";\n" +
+ "\tmso-bidi-theme-font:minor-bidi;}\n" +
+ "a:link, span.MsoHyperlink\n" +
+ "\t{mso-style-noshow:yes;\n" +
+ "\tmso-style-priority:99;\n" +
+ "\tcolor:blue;\n" +
+ "\ttext-decoration:underline;\n" +
+ "\ttext-underline:single;}\n" +
+ "a:visited, span.MsoHyperlinkFollowed\n" +
+ "\t{mso-style-noshow:yes;\n" +
+ "\tmso-style-priority:99;\n" +
+ "\tcolor:purple;\n" +
+ "\tmso-themecolor:followedhyperlink;\n" +
+ "\ttext-decoration:underline;\n" +
+ "\ttext-underline:single;}\n" +
+ "p\n" +
+ "\t{mso-style-noshow:yes;\n" +
+ "\tmso-style-priority:99;\n" +
+ "\tmso-margin-top-alt:auto;\n" +
+ "\tmargin-right:0in;\n" +
+ "\tmargin-bottom:5.75pt;\n" +
+ "\tmargin-left:0in;\n" +
+ "\tmso-pagination:widow-orphan;\n" +
+ "\tfont-size:12.0pt;\n" +
+ "\tfont-family:\"Times New Roman\",\"serif\";\n" +
+ "\tmso-fareast-font-family:\"Times New Roman\";}\n" +
+ ".MsoChpDefault\n" +
+ "\t{mso-style-type:export-only;\n" +
+ "\tmso-default-props:yes;\n" +
+ "\tmso-ascii-font-family:Calibri;\n" +
+ "\tmso-ascii-theme-font:minor-latin;\n" +
+ "\tmso-fareast-font-family:Calibri;\n" +
+ "\tmso-fareast-theme-font:minor-latin;\n" +
+ "\tmso-hansi-font-family:Calibri;\n" +
+ "\tmso-hansi-theme-font:minor-latin;\n" +
+ "\tmso-bidi-font-family:\"Times New Roman\";\n" +
+ "\tmso-bidi-theme-font:minor-bidi;}\n" +
+ ".MsoPapDefault\n" +
+ "\t{mso-style-type:export-only;\n" +
+ "\tmargin-bottom:10.0pt;\n" +
+ "\tline-height:115%;}\n" +
+ "@page Section1\n" +
+ "\t{size:595.3pt 841.9pt;\n" +
+ "\tmargin:56.7pt 42.5pt 56.7pt 85.05pt;\n" +
+ "\tmso-header-margin:.5in;\n" +
+ "\tmso-footer-margin:.5in;\n" +
+ "\tmso-paper-source:0;}\n" +
+ "div.Section1\n" +
+ "\t{page:Section1;}\n" +
+ "-->\n" +
+ "</style>" +
+ "<!--[if gte mso 10]>\n" +
+ "<style>\n" +
+ " /* Style Definitions */\n" +
+ " table.MsoNormalTable\n" +
+ "\t{mso-style-name:\"?z?\u00b1N\u2039N\u2021???\u00b0N? N\u201a?\u00b0?\u00b1?\u00bb??N\u2020?\u00b0\";\n" +
+ "\tmso-tstyle-rowband-size:0;\n" +
+ "\tmso-tstyle-colband-size:0;\n" +
+ "\tmso-style-noshow:yes;\n" +
+ "\tmso-style-priority:99;\n" +
+ "\tmso-style-qformat:yes;\n" +
+ "\tmso-style-parent:\"\";\n" +
+ "\tmso-padding-alt:0in 5.4pt 0in 5.4pt;\n" +
+ "\tmso-para-margin-top:0in;\n" +
+ "\tmso-para-margin-right:0in;\n" +
+ "\tmso-para-margin-bottom:10.0pt;\n" +
+ "\tmso-para-margin-left:0in;\n" +
+ "\tline-height:115%;\n" +
+ "\tmso-pagination:widow-orphan;\n" +
+ "\tfont-size:11.0pt;\n" +
+ "\tfont-family:\"Calibri\",\"sans-serif\";\n" +
+ "\tmso-ascii-font-family:Calibri;\n" +
+ "\tmso-ascii-theme-font:minor-latin;\n" +
+ "\tmso-fareast-font-family:\"Times New Roman\";\n" +
+ "\tmso-fareast-theme-font:minor-fareast;\n" +
+ "\tmso-hansi-font-family:Calibri;\n" +
+ "\tmso-hansi-theme-font:minor-latin;}\n" +
+ "</style>\n" +
+ "<![endif]" +
+ "-->\n" +
+ "\n" +
+ "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><a name=\"OLE_LINK2\"/><a name=\"OLE_LINK1\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>We where\n" +
+ "unsuccessful in reproducting this bug in our testing</span></b></span></a></p>\n" +
+ "\n" +
+ "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><span style=\"\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>environment.</span></b></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A\u00a0</o:p></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><s><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Could you provide us with a example URL\n" +
+ "where this is happening?</span></s></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Do you have any odd browser\n" +
+ "extensions/plugins installed?</span></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Does it happen on our site aswell </span></span></span><a href=\"http://tinymce.moxiecode.com/\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\";'>http://tinymce.moxiecode.com</span></span></span></a><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>?</span></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A\u00a0</o:p></span></span></p>\n" +
+ "\n" +
+ "<span style=\"\"/><span style=\"\"/>\n" +
+ "\n" +
+ "<p class=\"MsoNormal\"><o:p>A\u00a0</o:p></p>\n" +
+ "\n" +
+ "</p>";
+ assertHtml2SeamConverting(str);
+ }
+
+ public void testTextFromOpenOffice() throws Exception {
+ assertHtml2SeamConverting(
+ "<p style=\"margin-bottom: 0in; line-height: 100%;\" >" +
+ " <meta http-equiv=\"CONTENT-TYPE\" content=\"text/html;\" charset=\"utf-8\" />" +
+ " <title></title>" +
+ " <meta name=\"GENERATOR\" content=\"OpenOffice.org 3.0 (Win32)\" />" +
+ " <style type=\"text/css\"><!--" +
+ " <!" +
+ " @page { margin: 0.79in }" +
+ " P { margin-bottom: 0.08in }" +
+ " >" +
+ " --></style>" +
+ "</p>" +
+ "<p style=\"margin-bottom: 0in; line-height: 100%;\" " +
+ " align=\"center\" " +
+ " lang=\"en-US\">" +
+ " <font color=\"#000000\">" +
+ " <font color=\"#000001\">" +
+ " <font color=\"#000002\" style=\"font-size: 20pt;\" size=\"5\">" +
+ " <b>We where unsuccessful in reproducting this bug in our testing</b>" +
+ " </font>" +
+ " </font>" +
+ " </font>" +
+ "</p>" +
+ "<p style=\"margin-bottom: 0in; line-height: 100%;\" " +
+ " align=\"center\" " +
+ " lang=\"en-US\">" +
+ " <font color=\"#000000\">" +
+ " <font>" +
+ " <font style=\"font-size: 20pt;\" size=\"5\">" +
+ " <b>environment.</b>" +
+ " </font>" +
+ " </font>" +
+ " </font>" +
+ "</p>");
+ }
+
+ private String assertHtml2SeamConverting(String htmlText)
+ throws Exception {
+
+ final String seamText = convertHtmlToSeamText(htmlText);
+ System.out.println("seamText = \n" + seamText);
+
+ final SeamTextParser seamParser = new SeamTextParser(
+ new SeamTextLexer(new StringReader(seamText)));
+ seamParser.startRule();
+
+ return seamParser.toString();
+ }
+
+ private void assertSeamConverting(String seamTextExpression) throws TokenStreamException, RecognitionException {
+
+ final SeamTextParser seamParser = new SeamTextParser(new SeamTextLexer(new StringReader(seamTextExpression)));
+ seamParser.startRule();
+ final String html = seamParser.toString();
+ System.out.println("html = " + html);
+
+ final String seamtext = convertHtmlToSeamText(html);
+
+ assertEquals(seamTextExpression,seamtext.trim());
+ }
+
+ private String convertHtmlToSeamText(final String html) {
+ try {
+ return HtmlToSeamSAXParser.convertHtmlToSeamText(html);
+ } catch (Exception e) {
+ e.printStackTrace();
+ assertTrue(false);
+ }
+
+ return null;
+ }
+}
Added: trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java.cp1251
===================================================================
--- trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java.cp1251 (rev 0)
+++ trunk/ui/editor/src/test/java/org/richfaces/seamparser/HtmlSeamParserTest.java.cp1251 2009-04-03 00:35:54 UTC (rev 13372)
@@ -0,0 +1,759 @@
+package org.richfaces.seamparser;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+import junit.framework.TestCase;
+import org.jboss.seam.text.SeamTextLexer;
+import org.jboss.seam.text.SeamTextParser;
+import org.richfaces.convert.seamtext.HtmlToSeamSAXParser;
+
+import java.io.StringReader;
+
+/**
+ * @user: akolonitsky
+ * Date: Mar 25, 2009
+ */
+public class HtmlSeamParserTest extends TestCase {
+
+
+ private final static String SEAM_TEXT_EXPRESSION_1 = "It's easy to make *emphasis* -1- *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_.";
+
+ private final static String SEAM_TEXT_EXPRESSION_2 = "+ This is a big heading\n"
+ + "You /must/ have some text following a heading!\n\n"
+ + "++ This is a smaller heading\n"
+ + "This is the first paragraph. We can split it across multiple"
+ + "lines, but we must end it with a blank line.\n\n"
+ + "This is the second paragraph.";
+
+ private final static String SEAM_TEXT_EXPRESSION_3 = "An ordered list:\n\n"
+ + "# first item\n" + "# second item\n"
+ + "# and even the /third/ item\n\n" + "An unordered list:\n\n"
+ + "= an item\n" + "= another item";
+
+ private final static String SEAM_TEXT_EXPRESSION_4 = "The other guy said: " + "\"Nyeah nyeah-nee\"";
+
+ private final static String SEAM_TEXT_EXPRESSION_5 =
+ "You can write down equations like 2\\*3\\+4-7\\=3 and HTML tagslike \\<body\\> using the escape character: \\\\. foo(a)tut.by, 100$ cash 100%";
+
+ private final static String SEAM_TEXT_EXPRESSION_6 = "My code doesn't work:"
+ + "`for (int i=0; i<100; i--)\n"
+ + "{\n"
+ + "doSomething(){ String str = \"& >" \"; }; doSomething();\n"
+ + "doSomething() " +
+ "}`" + " Any ideas?";
+
+ private final static String SEAM_TEXT_EXPRESSION_7 = "+ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_8 = "++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_9 = "+++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_10 = "++++ test value<h1>test1<h2>test2</h2>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_11 = "+ test value<div>test5</div><h1>test1<div>test2</div>test4</h1>\ntest";
+
+ private final static String SEAM_TEXT_EXPRESSION_12 = "[test link=>http://test.com]";
+
+ private final static String SEAM_TEXT_EXPRESSION_13 = "[=>http://test.com]";
+
+ private final static String SEAM_TEXT_EXPRESSION_14 = "This is a |<tag attribute=\"value\"/>| example.";
+
+ private final static String SEAM_TEXT_EXPRESSION_15 = "= <div class=\"testClass1 testClass2\"></div><h1> test value </h1>";
+
+ private final static String SEAM_TEXT_EXPRESSION_16 = "# <div class=\"testClass1 testClass2\"></div><h1> test value </h1>";
+
+ private final static String SEAM_TEXT_EXPRESSION_17 = "paragraph\n\n+ header\ntext after header\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_18 = "paragraph\n\n++ header\ntext after header\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_19 = "paragraph\n\n+++ header\ntext after header\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_20 = "paragraph\n\n++++ header\ntext after header\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_21 = "paragraph\n\n= item1\n= item2\n= item3\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_22 = "paragraph\n\n# item1\n# item2\n# item3\n\nanother paragraph";
+
+ private final static String SEAM_TEXT_EXPRESSION_23 = "+ header text *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_24 = "++ header text *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_25 = "+++ header text *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_26 = "++++ header text *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n text after header *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+
+ private final static String SEAM_TEXT_EXPRESSION_27 = "= item1 *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n= item2 *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_28 = "# item1 *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_\n# item2 *emphasis*, |monospace|, "
+ + "~deleted text~, super^scripts^ or_underlines_";
+
+ private final static String SEAM_TEXT_EXPRESSION_29 = "A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9";
+
+ public HtmlSeamParserTest(String name) {
+ super(name);
+ }
+
+ public void testSeamTextConverting1() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_1);
+ }
+
+ public void testStandartSeamTextConverting2() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_2);
+ }
+
+ public void testStandartSeamTextConverting3() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_3);
+ }
+
+ public void testStandartSeamTextConverting4() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_4);
+ }
+
+ public void testStandartSeamTextConverting5() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_5);
+ }
+
+ public void testStandartSeamTextConverting6() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_6);
+ }
+
+ public void testStandartSeamTextConverting7() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_7);
+ }
+
+ public void testStandartSeamTextConverting8() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_8);
+ }
+
+ public void testStandartSeamTextConverting9() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_9);
+ }
+
+ public void testStandartSeamTextConverting10() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_10);
+ }
+
+ public void testStandartSeamTextConverting11() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_11);
+ }
+
+ public void testStandartSeamTextConverting12() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_12);
+ }
+
+ public void testStandartSeamTextConverting13() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_13);
+ }
+
+ public void testStandartSeamTextConverting14() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_14);
+ }
+
+ public void testStandartSeamTextConverting15() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_15);
+ }
+
+ public void testStandartSeamTextConverting16() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_16);
+ }
+
+ public void testStandartSeamTextConverting17() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_17);
+ }
+
+
+ public void testStandartSeamTextConverting18() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_18);
+ }
+
+ public void testStandartSeamTextConverting19() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_19);
+ }
+
+ public void testStandartSeamTextConverting20() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_20);
+ }
+
+ public void testStandartSeamTextConverting21() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_21);
+ }
+
+ public void testStandartSeamTextConverting22() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_22);
+ }
+
+ public void testStandartSeamTextConverting23() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_23);
+ }
+
+ public void testStandartSeamTextConverting24() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_24);
+ }
+
+ public void testStandartSeamTextConverting25() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_25);
+ }
+
+ public void testStandartSeamTextConverting26() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_26);
+ }
+
+ public void testStandartSeamTextConverting27() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_27);
+ }
+
+ public void testStandartSeamTextConverting28() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_28);
+ }
+
+ public void testStandartSeamTextConverting29() throws Exception {
+ assertSeamConverting(SEAM_TEXT_EXPRESSION_29);
+ }
+
+ public void testRF5717() throws Exception {
+ assertHtml2SeamConverting("<p>a<b a&b</p>");
+ }
+
+ public void testNestingFormating() throws Exception {
+ assertHtml2SeamConverting("<p><b>aaaaaaaaa <u><i class=\"seamTextEmphasis\">sssssssss</i> dddddddddddddddd</u></b></p>");
+ }
+
+ public void testNestingFormating1() throws Exception {
+ assertHtml2SeamConverting("<P><STRONG>aaaaaaaaad <U><B>ddddddddddddd</B> sssssssssssss</U></STRONG></P>");
+ }
+
+ public void testSkipComment() throws Exception {
+ assertHtml2SeamConverting("<!-- Hello Cfif -->");
+ }
+
+ public void testUglyTextFromWord() throws Exception {
+ final String str = "<p><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\"/><meta content=\"Word.Document\" name=\"ProgId\"/><meta content=\"Microsoft Word 12\" name=\"Generator\"/><meta content=\"Microsoft Word 12\" name=\"Originator\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_filelist.xml\" rel=\"File-List\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_themedata.thmx\" rel=\"themeData\"/><link href=\"file:///E:\\TEMP~1\\msohtmlclip1\\01\\clip_colorschememapping.xml\" rel=\"colorSchemeMapping\"/>" +
+ "<!--[if gte mso 9]><xml>\n" +
+ " <w:WordDocument>\n" +
+ " <w:View>Normal</w:View>\n" +
+ " <w:Zoom>0</w:Zoom>\n" +
+ " <w:TrackMoves/>\n" +
+ " <w:TrackFormatting/>\n" +
+ " <w:PunctuationKerning/>\n" +
+ " <w:ValidateAgainstSchemas/>\n" +
+ " <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>\n" +
+ " <w:IgnoreMixedContent>false</w:IgnoreMixedContent>\n" +
+ " <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>\n" +
+ " <w:DoNotPromoteQF/>\n" +
+ " <w:LidThemeOther>EN-US</w:LidThemeOther>\n" +
+ " <w:LidThemeAsian>X-NONE</w:LidThemeAsian>\n" +
+ " <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>\n" +
+ " <w:Compatibility>\n" +
+ " <w:BreakWrappedTables/>\n" +
+ " <w:SnapToGridInCell/>\n" +
+ " <w:WrapTextWithPunct/>\n" +
+ " <w:UseAsianBreakRules/>\n" +
+ " <w:DontGrowAutofit/>\n" +
+ " <w:SplitPgBreakAndParaMark/>\n" +
+ " <w:DontVertAlignCellWithSp/>\n" +
+ " <w:DontBreakConstrainedForcedTables/>\n" +
+ " <w:DontVertAlignInTxbx/>\n" +
+ " <w:Word11KerningPairs/>\n" +
+ " <w:CachedColBalance/>\n" +
+ " </w:Compatibility>\n" +
+ " <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>\n" +
+ " <m:mathPr>\n" +
+ " <m:mathFont m:val=\"Cambria Math\"/>\n" +
+ " <m:brkBin m:val=\"before\"/>\n" +
+ " <m:brkBinSub m:val=\"-\"/>\n" +
+ " <m:smallFrac m:val=\"off\"/>\n" +
+ " <m:dispDef/>\n" +
+ " <m:lMargin m:val=\"0\"/>\n" +
+ " <m:rMargin m:val=\"0\"/>\n" +
+ " <m:defJc m:val=\"centerGroup\"/>\n" +
+ " <m:wrapIndent m:val=\"1440\"/>\n" +
+ " <m:intLim m:val=\"subSup\"/>\n" +
+ " <m:naryLim m:val=\"undOvr\"/>\n" +
+ " </m:mathPr></w:WordDocument>\n" +
+ "</xml><![endif]-->" +
+ "<!--[if gte mso 9]><xml>\n" +
+ " <w:LatentStyles DefLockedState=\"false\" DefUnhideWhenUsed=\"true\"\n" +
+ " DefSemiHidden=\"true\" DefQFormat=\"false\" DefPriority=\"99\"\n" +
+ " LatentStyleCount=\"267\">\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"0\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Normal\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"heading 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 7\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 8\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"9\" QFormat=\"true\" Name=\"heading 9\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 7\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 8\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" Name=\"toc 9\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"35\" QFormat=\"true\" Name=\"caption\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"10\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Title\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"1\" Name=\"Default Paragraph Font\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"11\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtitle\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"22\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Strong\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"20\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Emphasis\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"59\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Table Grid\"/>\n" +
+ " <w:LsdException Locked=\"false\" UnhideWhenUsed=\"false\" Name=\"Placeholder Text\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"1\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"No Spacing\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" UnhideWhenUsed=\"false\" Name=\"Revision\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"34\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"List Paragraph\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"29\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Quote\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"30\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Quote\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 1\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 2\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 3\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 4\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 5\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"60\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Shading Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"61\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light List Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"62\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Light Grid Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"63\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 1 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"64\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Shading 2 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"65\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 1 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"66\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium List 2 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"67\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 1 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"68\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 2 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"69\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Medium Grid 3 Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"70\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Dark List Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"71\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Shading Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"72\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful List Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"73\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" Name=\"Colorful Grid Accent 6\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"19\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtle Emphasis\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"21\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Emphasis\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"31\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Subtle Reference\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"32\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Intense Reference\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"33\" SemiHidden=\"false\"\n" +
+ " UnhideWhenUsed=\"false\" QFormat=\"true\" Name=\"Book Title\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"37\" Name=\"Bibliography\"/>\n" +
+ " <w:LsdException Locked=\"false\" Priority=\"39\" QFormat=\"true\" Name=\"TOC Heading\"/>\n" +
+ " </w:LatentStyles>\n" +
+ "</xml><![endif]" +
+ "-->" +
+ "<style>\n" +
+ "<!--\n" +
+ " /* Font Definitions */\n" +
+ " @font-face\n" +
+ "\t{font-family:\"Cambria Math\";\n" +
+ "\tpanose-1:2 4 5 3 5 4 6 3 2 4;\n" +
+ "\tmso-font-charset:204;\n" +
+ "\tmso-generic-font-family:roman;\n" +
+ "\tmso-font-pitch:variable;\n" +
+ "\tmso-font-signature:-1610611985 1107304683 0 0 159 0;}\n" +
+ "@font-face\n" +
+ "\t{font-family:Calibri;\n" +
+ "\tpanose-1:2 15 5 2 2 2 4 3 2 4;\n" +
+ "\tmso-font-charset:204;\n" +
+ "\tmso-generic-font-family:swiss;\n" +
+ "\tmso-font-pitch:variable;\n" +
+ "\tmso-font-signature:-1610611985 1073750139 0 0 159 0;}\n" +
+ " /* Style Definitions */\n" +
+ " p.MsoNormal, li.MsoNormal, div.MsoNormal\n" +
+ "\t{mso-style-unhide:no;\n" +
+ "\tmso-style-qformat:yes;\n" +
+ "\tmso-style-parent:\"\";\n" +
+ "\tmargin-top:0in;\n" +
+ "\tmargin-right:0in;\n" +
+ "\tmargin-bottom:10.0pt;\n" +
+ "\tmargin-left:0in;\n" +
+ "\tline-height:115%;\n" +
+ "\tmso-pagination:widow-orphan;\n" +
+ "\tfont-size:11.0pt;\n" +
+ "\tfont-family:\"Calibri\",\"sans-serif\";\n" +
+ "\tmso-ascii-font-family:Calibri;\n" +
+ "\tmso-ascii-theme-font:minor-latin;\n" +
+ "\tmso-fareast-font-family:Calibri;\n" +
+ "\tmso-fareast-theme-font:minor-latin;\n" +
+ "\tmso-hansi-font-family:Calibri;\n" +
+ "\tmso-hansi-theme-font:minor-latin;\n" +
+ "\tmso-bidi-font-family:\"Times New Roman\";\n" +
+ "\tmso-bidi-theme-font:minor-bidi;}\n" +
+ "a:link, span.MsoHyperlink\n" +
+ "\t{mso-style-noshow:yes;\n" +
+ "\tmso-style-priority:99;\n" +
+ "\tcolor:blue;\n" +
+ "\ttext-decoration:underline;\n" +
+ "\ttext-underline:single;}\n" +
+ "a:visited, span.MsoHyperlinkFollowed\n" +
+ "\t{mso-style-noshow:yes;\n" +
+ "\tmso-style-priority:99;\n" +
+ "\tcolor:purple;\n" +
+ "\tmso-themecolor:followedhyperlink;\n" +
+ "\ttext-decoration:underline;\n" +
+ "\ttext-underline:single;}\n" +
+ "p\n" +
+ "\t{mso-style-noshow:yes;\n" +
+ "\tmso-style-priority:99;\n" +
+ "\tmso-margin-top-alt:auto;\n" +
+ "\tmargin-right:0in;\n" +
+ "\tmargin-bottom:5.75pt;\n" +
+ "\tmargin-left:0in;\n" +
+ "\tmso-pagination:widow-orphan;\n" +
+ "\tfont-size:12.0pt;\n" +
+ "\tfont-family:\"Times New Roman\",\"serif\";\n" +
+ "\tmso-fareast-font-family:\"Times New Roman\";}\n" +
+ ".MsoChpDefault\n" +
+ "\t{mso-style-type:export-only;\n" +
+ "\tmso-default-props:yes;\n" +
+ "\tmso-ascii-font-family:Calibri;\n" +
+ "\tmso-ascii-theme-font:minor-latin;\n" +
+ "\tmso-fareast-font-family:Calibri;\n" +
+ "\tmso-fareast-theme-font:minor-latin;\n" +
+ "\tmso-hansi-font-family:Calibri;\n" +
+ "\tmso-hansi-theme-font:minor-latin;\n" +
+ "\tmso-bidi-font-family:\"Times New Roman\";\n" +
+ "\tmso-bidi-theme-font:minor-bidi;}\n" +
+ ".MsoPapDefault\n" +
+ "\t{mso-style-type:export-only;\n" +
+ "\tmargin-bottom:10.0pt;\n" +
+ "\tline-height:115%;}\n" +
+ "@page Section1\n" +
+ "\t{size:595.3pt 841.9pt;\n" +
+ "\tmargin:56.7pt 42.5pt 56.7pt 85.05pt;\n" +
+ "\tmso-header-margin:.5in;\n" +
+ "\tmso-footer-margin:.5in;\n" +
+ "\tmso-paper-source:0;}\n" +
+ "div.Section1\n" +
+ "\t{page:Section1;}\n" +
+ "-->\n" +
+ "</style>" +
+ "<!--[if gte mso 10]>\n" +
+ "<style>\n" +
+ " /* Style Definitions */\n" +
+ " table.MsoNormalTable\n" +
+ "\t{mso-style-name:\"?z?�N�N�???�N? N�?�?�?�??N�?�\";\n" +
+ "\tmso-tstyle-rowband-size:0;\n" +
+ "\tmso-tstyle-colband-size:0;\n" +
+ "\tmso-style-noshow:yes;\n" +
+ "\tmso-style-priority:99;\n" +
+ "\tmso-style-qformat:yes;\n" +
+ "\tmso-style-parent:\"\";\n" +
+ "\tmso-padding-alt:0in 5.4pt 0in 5.4pt;\n" +
+ "\tmso-para-margin-top:0in;\n" +
+ "\tmso-para-margin-right:0in;\n" +
+ "\tmso-para-margin-bottom:10.0pt;\n" +
+ "\tmso-para-margin-left:0in;\n" +
+ "\tline-height:115%;\n" +
+ "\tmso-pagination:widow-orphan;\n" +
+ "\tfont-size:11.0pt;\n" +
+ "\tfont-family:\"Calibri\",\"sans-serif\";\n" +
+ "\tmso-ascii-font-family:Calibri;\n" +
+ "\tmso-ascii-theme-font:minor-latin;\n" +
+ "\tmso-fareast-font-family:\"Times New Roman\";\n" +
+ "\tmso-fareast-theme-font:minor-fareast;\n" +
+ "\tmso-hansi-font-family:Calibri;\n" +
+ "\tmso-hansi-theme-font:minor-latin;}\n" +
+ "</style>\n" +
+ "<![endif]" +
+ "-->\n" +
+ "\n" +
+ "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><a name=\"OLE_LINK2\"/><a name=\"OLE_LINK1\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>We where\n" +
+ "unsuccessful in reproducting this bug in our testing</span></b></span></a></p>\n" +
+ "\n" +
+ "<p align=\"center\" style=\"margin-bottom: 0.0001pt; text-align: center;\"><span style=\"\"><span style=\"\"><b><span style='font-size: 20pt; font-family: \"Courier New\"; color: black;'>environment.</span></b></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A�</o:p></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><s><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Could you provide us with a example URL\n" +
+ "where this is happening?</span></s></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Do you have any odd browser\n" +
+ "extensions/plugins installed?</span></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>Does it happen on our site aswell </span></span></span><a href=\"http://tinymce.moxiecode.com/\"><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\";'>http://tinymce.moxiecode.com</span></span></span></a><span style=\"\"><span style=\"\"><span style='font-size: 13pt; font-family: \"Courier New\"; color: black;'>?</span></span></span></p>\n" +
+ "\n" +
+ "<p style=\"margin-bottom: 0.0001pt;\"><span style=\"\"><span style=\"\"><o:p>A�</o:p></span></span></p>\n" +
+ "\n" +
+ "<span style=\"\"/><span style=\"\"/>\n" +
+ "\n" +
+ "<p class=\"MsoNormal\"><o:p>A�</o:p></p>\n" +
+ "\n" +
+ "</p>";
+ assertHtml2SeamConverting(str);
+ }
+
+ public void testTextFromOpenOffice() throws Exception {
+ assertHtml2SeamConverting(
+ "<p style=\"margin-bottom: 0in; line-height: 100%;\" >" +
+ " <meta http-equiv=\"CONTENT-TYPE\" content=\"text/html;\" charset=\"utf-8\" />" +
+ " <title></title>" +
+ " <meta name=\"GENERATOR\" content=\"OpenOffice.org 3.0 (Win32)\" />" +
+ " <style type=\"text/css\"><!--" +
+ " <!" +
+ " @page { margin: 0.79in }" +
+ " P { margin-bottom: 0.08in }" +
+ " >" +
+ " --></style>" +
+ "</p>" +
+ "<p style=\"margin-bottom: 0in; line-height: 100%;\" " +
+ " align=\"center\" " +
+ " lang=\"en-US\">" +
+ " <font color=\"#000000\">" +
+ " <font color=\"#000001\">" +
+ " <font color=\"#000002\" style=\"font-size: 20pt;\" size=\"5\">" +
+ " <b>We where unsuccessful in reproducting this bug in our testing</b>" +
+ " </font>" +
+ " </font>" +
+ " </font>" +
+ "</p>" +
+ "<p style=\"margin-bottom: 0in; line-height: 100%;\" " +
+ " align=\"center\" " +
+ " lang=\"en-US\">" +
+ " <font color=\"#000000\">" +
+ " <font>" +
+ " <font style=\"font-size: 20pt;\" size=\"5\">" +
+ " <b>environment.</b>" +
+ " </font>" +
+ " </font>" +
+ " </font>" +
+ "</p>");
+ }
+
+ private String assertHtml2SeamConverting(String htmlText)
+ throws Exception {
+
+ final String seamText = convertHtmlToSeamText(htmlText);
+ System.out.println("seamText = \n" + seamText);
+
+ final SeamTextParser seamParser = new SeamTextParser(
+ new SeamTextLexer(new StringReader(seamText)));
+ seamParser.startRule();
+
+ return seamParser.toString();
+ }
+
+ private void assertSeamConverting(String seamTextExpression) throws TokenStreamException, RecognitionException {
+
+ final SeamTextParser seamParser = new SeamTextParser(new SeamTextLexer(new StringReader(seamTextExpression)));
+ seamParser.startRule();
+ final String html = seamParser.toString();
+ System.out.println("html = " + html);
+
+ final String seamtext = convertHtmlToSeamText(html);
+
+ assertEquals(seamTextExpression,seamtext.trim());
+ }
+
+ private String convertHtmlToSeamText(final String html) {
+ try {
+ return HtmlToSeamSAXParser.convertHtmlToSeamText(html);
+ } catch (Exception e) {
+ e.printStackTrace();
+ assertTrue(false);
+ }
+
+ return null;
+ }
+}
\ No newline at end of file
Modified: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java 2009-04-02 23:02:16 UTC (rev 13371)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java 2009-04-03 00:35:54 UTC (rev 13372)
@@ -136,14 +136,35 @@
// We have only equal size for an three-column layout.
yahooClass = "yui-gb";
} else if(null != left && null != center){
+ int leftPart = 0;
String leftWidth = left.getWidth();
+ if(null != leftWidth){
+ leftPart = Integer.parseInt(leftWidth);
+ }
+ int rightPart = 0;
String centerWidth = center.getWidth();
+ if(null != centerWidth){
+ rightPart = Integer.parseInt(centerWidth);
+ if(0 ==leftPart && 0>rightPart && centerWidth.endsWith("%")){
+ leftPart = 100 - rightPart;
+ }
+ }
+ if(0 > leftPart && 0 == rightPart && leftWidth.endsWith("%")){
+ rightPart = 100 - leftPart;
+ }
// Calculate properly class.
- if ("75%".equals(leftWidth)) {
+ if(0>leftPart && 0>rightPart){
+ double ratio = (double)leftPart/(double)(leftPart+rightPart);
+ if (ratio <= 0.25) {
+ yahooClass = "yui-gf";
+ } else if (ratio <= 0.33) {
+ yahooClass = "yui-gd";
+ } else if (ratio <= 0.66) {
yahooClass = "yui-gc";
- } else if ("66%".equals(leftWidth)) {
- yahooClass = "yui-gd";
+ } else {
+ yahooClass = "yui-ge";
}
+ }
}
return yahooClass;
}
Modified: trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
===================================================================
--- trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-04-02 23:02:16 UTC (rev 13371)
+++ trunk/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-04-03 00:35:54 UTC (rev 13372)
@@ -28,7 +28,9 @@
x:style="#{component.attributes['pageStyle']}">
<c:if test="#{this:hasFacet(component,'header')}">
<div id="#{clientId}:hd" class="rich-page-header #{component.attributes['headerClass']}">
+ <div id="#{clientId}:hdc" class="rich-page-header-content">
<u:insertFacet name="header"/>
+ </div>
</div>
</c:if>
<c:if test="#{this:hasFacet(component,'subheader')}">
@@ -53,7 +55,9 @@
<c:if test="#{this:hasFacet(component,'footer')}">
<f:clientid var="clientId"/>
<div id="#{clientId}:ft" class="rich-page-footer #{component.attributes['footerClass']}">
- <u:insertFacet name="footer"/>
+ <div id="#{clientId}:ftc" class="rich-page-footer-content">
+ <u:insertFacet name="footer"/>
+ </div>
</div>
</c:if>
</div>
15 years, 1 month
JBoss Rich Faces SVN: r13371 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-02 19:02:16 -0400 (Thu, 02 Apr 2009)
New Revision: 13371
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/usage.xhtml
Log:
Typo in skinning page fixed
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/usage.xhtml 2009-04-02 22:52:11 UTC (rev 13370)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/standardSkinning/usage.xhtml 2009-04-02 23:02:16 UTC (rev 13371)
@@ -84,7 +84,7 @@
</li>
<li>
By default <b>org.richfaces.CONTROL_SKINNING_CLASSES</b> context param is set to
- <b>enabled</b> and it
+ <b>enable</b> and it
means that basic elements nested to element having <i>rich-container</i> class
will be skinned. It could be also turned off using <b>disable</b> value.
</li>
15 years, 1 month
JBoss Rich Faces SVN: r13370 - in trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload: Noname/5 and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-02 18:52:11 -0400 (Thu, 02 Apr 2009)
New Revision: 13370
Added:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.jpg
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.jp
Log:
Lowercasing file names
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.jp)
===================================================================
(Binary files differ)
15 years, 1 month
JBoss Rich Faces SVN: r13369 - in trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload: Viking/1 and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-02 18:47:14 -0400 (Thu, 02 Apr 2009)
New Revision: 13369
Added:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/balloon.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/hghjump.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn01.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn04.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn29.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn39.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn64.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/sa28.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/swimmer.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/church.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/pinn71.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/pinn82.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/deer.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/dog2.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/pinn40.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/pinn51.jpg
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/turtle.jpg
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/BALLOON.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/HGHJUMP.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN01.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN04.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN29.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN39.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN64.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SA28.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SWIMMER.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/CHURCH.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN71.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN82.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DEER.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DOG2.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN40.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN51.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/TURTLE.jp
Log:
Lowercasing file names
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/BALLOON.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/HGHJUMP.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN01.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN04.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN29.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN39.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN64.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SA28.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SWIMMER.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/balloon.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/BALLOON.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/hghjump.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/HGHJUMP.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn01.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN01.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn04.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN04.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn29.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN29.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn39.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN39.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/pinn64.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN64.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/sa28.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SA28.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/swimmer.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SWIMMER.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/CHURCH.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN71.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN82.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/church.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/CHURCH.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/pinn71.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN71.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/pinn82.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN82.jp)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DEER.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DOG2.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN40.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN51.jp
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/TURTLE.jp
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/deer.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DEER.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/dog2.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DOG2.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/pinn40.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN40.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/pinn51.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN51.jp)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/turtle.jpg (from rev 13368, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/TURTLE.jp)
===================================================================
(Binary files differ)
15 years, 1 month
JBoss Rich Faces SVN: r13368 - in trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload: Noname/5 and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-02 18:44:35 -0400 (Thu, 02 Apr 2009)
New Revision: 13368
Added:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/BALLOON.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/HGHJUMP.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN01.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN04.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN29.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN39.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN64.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SA28.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SWIMMER.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/CHURCH.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN71.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN82.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DEER.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DOG2.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN40.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN51.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/TURTLE.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.jp
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.jp
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/BALLOON.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/HGHJUMP.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN01.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN04.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN29.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN39.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN64.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SA28.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SWIMMER.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/CHURCH.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN71.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN82.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DEER.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DOG2.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN40.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN51.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/TURTLE.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.JPG
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.JPG
Log:
Lowercasing file names
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203015.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203034.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203036.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203043.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203049.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203052.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203053.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203054.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203058.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203066.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203067.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203071.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203072.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203073.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/2/203076.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/23048.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400003.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400033.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400048.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/400081.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/479031.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/BALLOON.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/BALLOON.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/BALLOON.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/HGHJUMP.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/HGHJUMP.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/HGHJUMP.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN01.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN01.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN01.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN04.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN04.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN04.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN29.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN29.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN29.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN39.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN39.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN39.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN64.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN64.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/PINN64.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SA28.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SA28.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SA28.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SWIMMER.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SWIMMER.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Noname/5/SWIMMER.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400018.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400036.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400069.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400076.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/400083.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/CHURCH.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/CHURCH.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/CHURCH.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN71.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN71.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN71.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN82.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN82.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/1/PINN82.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184023.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184030.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184031.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184033.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184034.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184035.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184038.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184040.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184044.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184046.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184047.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184053.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184057.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184063.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184069.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184072.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184077.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184078.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/184079.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/Viking/4/400000.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/10005.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400004.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400008.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400027.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400028.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400034.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400035.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400063.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/400095.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DEER.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DEER.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DEER.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DOG2.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DOG2.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/DOG2.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN40.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN40.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN40.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN51.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN51.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/PINN51.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/TURTLE.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/TURTLE.jp (from rev 13367, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/TURTLE.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132000.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132022.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132051.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132059.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132060.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132071.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132074.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/132078.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142011.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/142039.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167049.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/167055.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400010.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/400073.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/3/403011.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45000.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45001.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45002.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45003.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45004.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45005.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45006.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45009.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45010.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45012.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45013.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45014.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45016.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45017.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45018.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45019.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45020.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45021.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45022.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45023.JPG)
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.jp (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/6/45024.JPG)
===================================================================
(Binary files differ)
15 years, 1 month
JBoss Rich Faces SVN: r13367 - trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-04-02 18:28:53 -0400 (Thu, 02 Apr 2009)
New Revision: 13367
Added:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/067.jpg
Removed:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/067.JPG
Log:
Deleted: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/067.JPG
===================================================================
(Binary files differ)
Copied: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/067.jpg (from rev 13366, trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/Upload/amarkhel/0/067.JPG)
===================================================================
(Binary files differ)
15 years, 1 month