You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/03/10 04:02:39 UTC
svn commit: r1575801 - in /roller/trunk/app/src:
main/java/org/apache/roller/weblogger/
main/java/org/apache/roller/weblogger/business/jpa/
main/java/org/apache/roller/weblogger/pojos/
main/java/org/apache/roller/weblogger/pojos/wrapper/ main/java/org/...
Author: gmazza
Date: Mon Mar 10 03:02:38 2014
New Revision: 1575801
URL: http://svn.apache.org/r1575801
Log:
Removed folder description and bookmark weight fields to simplify code and UI.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_da.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_is.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
roller/trunk/app/src/main/resources/ApplicationResources_vi.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java Mon Mar 10 03:02:38 2014
@@ -616,7 +616,7 @@ public final class TestUtils {
.getBookmarkManager();
WeblogBookmarkFolder testFolder = new WeblogBookmarkFolder(
- name, null, weblog);
+ name, weblog);
mgr.saveFolder(testFolder);
// flush to db
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java Mon Mar 10 03:02:38 2014
@@ -140,7 +140,7 @@ public class JPABookmarkManagerImpl impl
WeblogBookmarkFolder newFolder = getFolder(website, folderName);
if (newFolder == null) {
newFolder = new WeblogBookmarkFolder(
- folderName, null, website);
+ folderName, website);
this.strategy.store(newFolder);
}
@@ -203,7 +203,6 @@ public class JPABookmarkManagerImpl impl
desc,
url,
xmlUrl,
- 0,
100,
null);
parent.addBookmark(bd);
@@ -214,7 +213,6 @@ public class JPABookmarkManagerImpl impl
// Store a folder
WeblogBookmarkFolder fd = new WeblogBookmarkFolder(
title,
- desc,
parent.getWeblog());
this.strategy.store(fd);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Mon Mar 10 03:02:38 2014
@@ -314,7 +314,7 @@ public class JPAWeblogManagerImpl implem
// add default bookmarks
WeblogBookmarkFolder root = new WeblogBookmarkFolder(
- "default", null, newWeblog);
+ "default", newWeblog);
this.strategy.store(root);
Integer zero = 0;
@@ -330,7 +330,6 @@ public class JPAWeblogManagerImpl implem
"", // description
rollitems[1].trim(), // url
null, // feedurl
- zero, // weight
zero, // priority
null); // image
this.strategy.store(b);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java Mon Mar 10 03:02:38 2014
@@ -39,7 +39,6 @@ public class WeblogBookmark implements S
private String name;
private String description;
private String url;
- private Integer weight;
private Integer priority;
private String image;
private String feedUrl;
@@ -56,7 +55,6 @@ public class WeblogBookmark implements S
String desc,
String url,
String feedUrl,
- Integer weight,
Integer priority,
String image) {
this.folder = parent;
@@ -64,7 +62,6 @@ public class WeblogBookmark implements S
this.description = desc;
this.url = url;
this.feedUrl = feedUrl;
- this.weight = weight;
this.priority = priority;
this.image = image;
}
@@ -113,17 +110,6 @@ public class WeblogBookmark implements S
}
/**
- * Weight indicates prominence of link
- */
- public java.lang.Integer getWeight() {
- return this.weight;
- }
-
- public void setWeight(java.lang.Integer weight) {
- this.weight = weight;
- }
-
- /**
* Priority determines order of display
*/
public java.lang.Integer getPriority() {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Mon Mar 10 03:02:38 2014
@@ -46,7 +46,6 @@ public class WeblogBookmarkFolder implem
// attributes
private String id = UUIDGenerator.generateUUID();
private String name = null;
- private String description = null;
// associations
private Weblog weblog = null;
@@ -58,11 +57,9 @@ public class WeblogBookmarkFolder implem
public WeblogBookmarkFolder(
String name,
- String desc,
Weblog weblog) {
this.name = name;
- this.description = desc;
this.weblog = weblog;
weblog.addBookmarkFolder(this);
}
@@ -139,18 +136,6 @@ public class WeblogBookmarkFolder implem
this.name = name;
}
-
- /**
- * A full description for this folder.
- */
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
/**
* Get the weblog which owns this folder.
*/
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java Mon Mar 10 03:02:38 2014
@@ -61,11 +61,6 @@ public final class WeblogBookmarkFolderW
}
- public String getDescription() {
- return this.pojo.getDescription();
- }
-
-
public List<WeblogBookmarkWrapper> getBookmarks() {
Set<WeblogBookmark> initialCollection = new TreeSet<WeblogBookmark>(new BookmarkComparator());
initialCollection.addAll(this.pojo.getBookmarks());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java Mon Mar 10 03:02:38 2014
@@ -33,8 +33,7 @@ public final class WeblogBookmarkWrapper
private WeblogBookmarkWrapper(WeblogBookmark toWrap) {
this.pojo = toWrap;
}
-
-
+
// wrap the given pojo if it is not null
public static WeblogBookmarkWrapper wrap(WeblogBookmark toWrap) {
if(toWrap != null) {
@@ -43,8 +42,7 @@ public final class WeblogBookmarkWrapper
return null;
}
-
-
+
public String getId() {
return this.pojo.getId();
}
@@ -63,18 +61,11 @@ public final class WeblogBookmarkWrapper
public String getUrl() {
return this.pojo.getUrl();
}
-
-
- public Integer getWeight() {
- return this.pojo.getWeight();
- }
-
-
+
public Integer getPriority() {
return this.pojo.getPriority();
}
-
-
+
public String getImage() {
return this.pojo.getImage();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java Mon Mar 10 03:02:38 2014
@@ -30,7 +30,6 @@ public class BookmarkBean {
private String name = null;
private String description = null;
private String url = null;
- private Integer weight = 0;
private Integer priority = 0;
private String image = null;
private String feedUrl = null;
@@ -68,14 +67,6 @@ public class BookmarkBean {
this.url = url;
}
- public Integer getWeight() {
- return this.weight;
- }
-
- public void setWeight( Integer weight ) {
- this.weight = weight;
- }
-
public Integer getPriority() {
return this.priority;
}
@@ -105,7 +96,6 @@ public class BookmarkBean {
dataHolder.setName(this.name);
dataHolder.setDescription(this.description);
dataHolder.setUrl(this.url);
- dataHolder.setWeight(this.weight);
dataHolder.setPriority(this.priority);
dataHolder.setImage(this.image);
dataHolder.setFeedUrl(this.feedUrl);
@@ -117,7 +107,6 @@ public class BookmarkBean {
this.name = dataHolder.getName();
this.description = dataHolder.getDescription();
this.url = dataHolder.getUrl();
- this.weight = dataHolder.getWeight();
this.priority = dataHolder.getPriority();
this.image = dataHolder.getImage();
this.feedUrl = dataHolder.getFeedUrl();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java Mon Mar 10 03:02:38 2014
@@ -68,7 +68,6 @@ public class FolderAdd extends UIAction
try {
WeblogBookmarkFolder newFolder = new WeblogBookmarkFolder(
getBean().getName(),
- getBean().getDescription(),
getActionWeblog());
// save changes
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java Mon Mar 10 03:02:38 2014
@@ -21,7 +21,6 @@ package org.apache.roller.weblogger.ui.s
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-
/**
* Bean for managing folder data.
*/
@@ -29,9 +28,7 @@ public class FolderBean {
protected String id = null;
protected String name = null;
- protected String description = null;
-
-
+
public String getId() {
return this.id;
}
@@ -47,30 +44,15 @@ public class FolderBean {
public void setName( String name ) {
this.name = name;
}
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription( String description ) {
- this.description = description;
- }
-
-
+
public void copyTo(WeblogBookmarkFolder dataHolder) throws WebloggerException {
-
if(!dataHolder.getName().equals(this.name)) {
dataHolder.updateName(this.name);
}
-
- dataHolder.setDescription(this.description);
}
-
-
+
public void copyFrom(WeblogBookmarkFolder dataHolder) {
this.id = dataHolder.getId();
this.name = dataHolder.getName();
- this.description = dataHolder.getDescription();
}
-
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Mon Mar 10 03:02:38 2014
@@ -44,7 +44,6 @@ bookmarkForm.priority=Sort Priority
bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.save=Save
bookmarkForm.url=Bookmark URL
-bookmarkForm.weight=Display Weight
bookmarkForm.error.invalidURL=Invalid URL: {0}
@@ -54,8 +53,6 @@ Bookmark.error.nameSize=Name cannot be m
Bookmark.error.descriptionSize=Description cannot be more than 255 characters
Bookmark.error.urlNull=URL is a required field
Bookmark.error.urlBad=The URL you entered is not valid
-Bookmark.error.weightNull=Weight is a required field
-Bookmark.error.weightNotInt=Weight must be a valid integer
Bookmark.error.priorityNull=Priority is a required field
Bookmark.error.priorityNotInt=Priority must be a valid integer
Bookmark.error.imageBad=The image URL you entered is not valid
Modified: roller/trunk/app/src/main/resources/ApplicationResources_da.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_da.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_da.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_da.properties Mon Mar 10 03:02:38 2014
@@ -43,7 +43,6 @@ bookmarkForm.priority=Sorter egenskaber
bookmarkForm.rssUrl=Nyhedsfeedens URL
bookmarkForm.save=Gem
bookmarkForm.url=Bogm�rkets URL
-bookmarkForm.weight=Vis v�gt
bookmarkForm.error.invalidURL=Ugyldig URL: {0}
@@ -53,8 +52,6 @@ Bookmark.error.nameSize=Navn m� ikk
Bookmark.error.descriptionSize=Beskrivelse m� ikke v�re l�nger end 255 tegn
Bookmark.error.urlNull=Url er kr�vet
Bookmark.error.urlBad=Den angivne URL er ugyldig
-Bookmark.error.weightNull=V�gt er kr�vet
-Bookmark.error.weightNotInt=V�gt must be a valid integer
Bookmark.error.priorityNull=Prioritet er kr�vet
Bookmark.error.priorityNotInt=Prioritet skal v�re et heltal
Bookmark.error.imageBad=Den angivne billed-URL er ugyldig
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Mon Mar 10 03:02:38 2014
@@ -14,8 +14,6 @@ Bookmark.error.priorityNotInt=Die Priori
Bookmark.error.priorityNull=Die Priorit\u00E4t muss eingegeben werden
Bookmark.error.urlBad=Die eingegebeneURL ist ung\u00FCltig
Bookmark.error.urlNull=Die URL muss eingegeben werden
-Bookmark.error.weightNotInt=Die Gewichtung muss eine ganze Zahl sein
-Bookmark.error.weightNull=Die Gewichtung muss eingegeben werden
Category.error.descriptionSize=Die Beschreibung darf nicht l\u00E4nger als 255 Zeichen sein
Category.error.imageBad=Die eingegebene Bild-URL ist ung\u00FCltig
# errors from validation
@@ -108,7 +106,6 @@ bookmarkForm.priority=Priorit\u00E4t f\u
bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.save=Speichern
bookmarkForm.url=Lesezeichen URL
-bookmarkForm.weight=Gewichtung f\u00FCr Anzeige
# --------------------------------------------------------- BookmarksForm.jsp
bookmarksForm.addBookmark=Lesezeichen hinzuf\u00FCgen
bookmarksForm.addFolder=Ordner hinzuf\u00FCgen
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Mon Mar 10 03:02:38 2014
@@ -19,7 +19,6 @@ bookmarkForm.priority = Prioridad de ord
bookmarkForm.rssUrl = URL de la suscripci\u00F3n
bookmarkForm.save = Guardar
bookmarkForm.url = URL del marcador
-bookmarkForm.weight = Ancho de pantalla
bookmarksForm.root = ra\u00EDz
bookmarksForm.rootTitle = Blogroll
bookmarksForm.folderTitle = Carpeta de marcadores [{0}]
Modified: roller/trunk/app/src/main/resources/ApplicationResources_is.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_is.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_is.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_is.properties Mon Mar 10 03:02:38 2014
@@ -66,7 +66,6 @@ bookmarkForm.priority=Forgangsr�ï�
bookmarkForm.rssUrl=Sl�� fr�ttaveitu
bookmarkForm.save=Vista
bookmarkForm.url=Tengill
-bookmarkForm.weight=Birtingar�yngd
# --------------------------------------------------------- BookmarksForm.jsp
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Mon Mar 10 03:02:38 2014
@@ -43,7 +43,6 @@ bookmarkForm.priority=\u30BD\u30FC\u30C8
bookmarkForm.rssUrl=Newsfeed\u306EURL
bookmarkForm.save=\u4FDD\u5B58
bookmarkForm.url=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u306EURL
-bookmarkForm.weight=Weight\u8868\u793A
# ----------------------------------------------------------- BookmarksForm.jsp
@@ -1827,8 +1826,6 @@ pageForm.outputContentTypeCustom=\u30AB\
ConfigForm.adminEmail=Planet\u7BA1\u7406\u8005\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
Bookmark.error.urlNull=URL\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
Bookmark.error.urlBad=\u7121\u52B9\u306AURL\u3067\u3059
-Bookmark.error.weightNull=\u30A6\u30A7\u30A4\u30C8\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
-Bookmark.error.weightNotInt=\u30A6\u30A7\u30A4\u30C8\u306F\u6574\u6570\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
Bookmark.error.priorityNull=\u512A\u5148\u9806\u4F4D\u306F\u5FC5\u9808\u9805\u76EE\u3067\u3059
Bookmark.error.priorityNotInt=\u512A\u5148\u9806\u4F4D\u306F\u6574\u6570\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
Bookmark.error.imageBad=\u6307\u5B9A\u3055\u308C\u305F\u753B\u50CF\u306EURL\u306F\u7121\u52B9\u306A\u30A2\u30C9\u30EC\u30B9\u3067\u3059
Modified: roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_nl.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_nl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_nl.properties Mon Mar 10 03:02:38 2014
@@ -67,7 +67,6 @@ bookmarkForm.priority=Sorteer Prioriteit
bookmarkForm.rssUrl=URL van RSS feed
bookmarkForm.save=Bewaren
bookmarkForm.url=URL van Favoriet
-bookmarkForm.weight=Nadruk bij Tonen
# ---------------------------------------------------------- BookmarksForm.jsp
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Mon Mar 10 03:02:38 2014
@@ -31,7 +31,6 @@ bookmarkForm.priority=\u0421\u043e\u0440
bookmarkForm.rssUrl=URL \u041d\u043e\u0432\u043e\u0441\u0442\u0435\u0439
bookmarkForm.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
bookmarkForm.url=URL \u0421\u0441\u044b\u043b\u043a\u0438
-bookmarkForm.weight=Display Weight
# ----------------------------------------------------------- BookmarksForm.jsp
Modified: roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_sl.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_sl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_sl.properties Mon Mar 10 03:02:38 2014
@@ -43,7 +43,6 @@ bookmarkForm.priority=Zaporedje Sortiran
bookmarkForm.rssUrl=URL naslova Kanala Novic
bookmarkForm.save=Shrani
bookmarkForm.url=Zaznamek URL
-bookmarkForm.weight=Prika\u017Ei Ute\u017E
bookmarkForm.error.invalidURL=Nepravilen URL: {0}
@@ -53,8 +52,6 @@ Bookmark.error.nameSize=Ime ne more biti
Bookmark.error.descriptionSize=Opis ne more biti dalj\u0161i od 255 znakov
Bookmark.error.urlNull=Polje za URL je zahtevano
Bookmark.error.urlBad=Vneseni url ni pravilen
-Bookmark.error.weightNull=Polje za ute\u017E je zahtevano
-Bookmark.error.weightNotInt=Ute\u017E mora biti veljavno celo \u0161tevilo
Bookmark.error.priorityNull=Polje za prednost je zahtevano
Bookmark.error.priorityNotInt=Prednost mora biti veljavno celo \u0161tevilo
Bookmark.error.imageBad=Vneseni url za sliko ni pravilen
Modified: roller/trunk/app/src/main/resources/ApplicationResources_vi.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_vi.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_vi.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_vi.properties Mon Mar 10 03:02:38 2014
@@ -66,7 +66,6 @@ bookmarkForm.priority=Th\u1ee9 t\u1ee5 \
bookmarkForm.rssUrl=\u0110\u1ecba ch\u1ec9 Newsfeed
bookmarkForm.save=L\u01b0u
bookmarkForm.url=\u0110\u1ecba ch\u1ec9 URL c\u1ee7a th\u1ebb \u0111\u00e1nh d\u1ea5u
-bookmarkForm.weight=Hi\u1ec3n th\u1ecb tr\u1ecdng s\u1ed1
# --------------------------------------------------------- BookmarksForm.jsp
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Mon Mar 10 03:02:38 2014
@@ -35,7 +35,6 @@ bookmarkForm.priority=\u6392\u5e8f\u4f18
bookmarkForm.rssUrl=\u65b0\u95fb\u79cd\u5b50URL
bookmarkForm.save=\u4fdd\u5b58
bookmarkForm.url=\u4e66\u7b7eURL
-bookmarkForm.weight=\u663e\u793a\u5bbd\u5ea6
bookmarksForm.addBookmark=\u6dfb\u52a0\u4e00\u4e2a\u4e66\u7b7e
bookmarksForm.addFolder=\u6dfb\u52a0\u4e66\u7b7e\u5939
bookmarksForm.checkAll=\u5168\u90e8\u9009\u62e9
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties Mon Mar 10 03:02:38 2014
@@ -67,7 +67,6 @@ bookmarkForm.priority=\u6307\u5b9a\u512a
bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.save=\u5b58\u6a94
bookmarkForm.url=\u66f8\u7c64URL
-bookmarkForm.weight=\u986f\u793a\u5bec\u5ea6
# --------------------------------------------------------- BookmarksForm.jsp
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml Mon Mar 10 03:02:38 2014
@@ -22,9 +22,6 @@
<basic name="url">
<column name="url" insertable="true" updatable="true" unique="false"/>
</basic>
- <basic name="weight">
- <column name="weight" insertable="true" updatable="true" unique="false"/>
- </basic>
<basic name="priority">
<column name="priority" insertable="true" updatable="true" unique="false"/>
</basic>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml Mon Mar 10 03:02:38 2014
@@ -19,9 +19,6 @@
<basic name="name">
<column name="name" insertable="true" updatable="true" unique="false"/>
</basic>
- <basic name="description">
- <column name="description" insertable="true" updatable="true" unique="false"/>
- </basic>
<many-to-one name="weblog" target-entity="org.apache.roller.weblogger.pojos.Weblog">
<join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
</many-to-one>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml Mon Mar 10 03:02:38 2014
@@ -31,16 +31,6 @@
</field-validator>
</field>
- <field name="bean.weight">
- <field-validator type="required">
- <message key="Bookmark.error.weightNull">unspecified key</message>
- </field-validator>
-
- <field-validator type="int">
- <message key="Bookmark.error.weightNotInt">unspecified key</message>
- </field-validator>
- </field>
-
<field name="bean.priority">
<field-validator type="required">
<message key="Bookmark.error.priorityNull">unspecified key</message>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml Mon Mar 10 03:02:38 2014
@@ -31,16 +31,6 @@
</field-validator>
</field>
- <field name="bean.weight">
- <field-validator type="required">
- <message key="Bookmark.error.weightNull">unspecified key</message>
- </field-validator>
-
- <field-validator type="int">
- <message key="Bookmark.error.weightNotInt">unspecified key</message>
- </field-validator>
- </field>
-
<field name="bean.priority">
<field-validator type="required">
<message key="Bookmark.error.priorityNull">unspecified key</message>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd-validation.xml Mon Mar 10 03:02:38 2014
@@ -13,12 +13,5 @@
<message key="Folder.error.nameSize">unspecified key</message>
</field-validator>
</field>
-
- <field name="bean.description">
- <field-validator type="stringlength">
- <param name="maxLength">255</param>
- <message key="Folder.error.descriptionSize">unspecified key</message>
- </field-validator>
- </field>
-
+
</validators>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit-validation.xml Mon Mar 10 03:02:38 2014
@@ -13,12 +13,5 @@
<message key="Folder.error.nameSize">unspecified key</message>
</field-validator>
</field>
-
- <field name="bean.description">
- <field-validator type="stringlength">
- <param name="maxLength">255</param>
- <message key="Folder.error.descriptionSize">unspecified key</message>
- </field-validator>
- </field>
-
+
</validators>
Modified: roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm Mon Mar 10 03:02:38 2014
@@ -41,3 +41,5 @@ delete from pingtarget where websiteid i
update folder set name = 'default' where name = 'root' and parentid is null;
#dropColumn("folder" 'parentid')
#dropColumn("folder" 'path')
+#dropColumn("folder" "description")
+#dropColumn("bookmark" "weight")
Modified: roller/trunk/app/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/createdb.vm?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Mon Mar 10 03:02:38 2014
@@ -162,7 +162,6 @@ create table rol_templatecode (
create table folder (
id varchar(48) not null primary key,
name varchar(255) not null,
- description varchar(255),
websiteid varchar(48) not null
);
create index fo_websiteid_idx on folder( websiteid );
@@ -173,7 +172,6 @@ create table bookmark (
name varchar(255) not null,
description varchar(255),
url varchar(255) not null,
- weight integer default 0 not null,
priority integer default 100 not null,
image varchar(255),
feedurl varchar(255)
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp Mon Mar 10 03:02:38 2014
@@ -59,12 +59,7 @@
<td><s:text name="bookmarkForm.priority" /></td>
<td><s:textfield name="bean.priority" maxlength="255" size="5" /></td>
</tr>
-
- <tr>
- <td><s:text name="bookmarkForm.weight" /></td>
- <td><s:textfield name="bean.weight" maxlength="255" size="5" /></td>
- </tr>
-
+
</table>
<p>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp Mon Mar 10 03:02:38 2014
@@ -62,12 +62,7 @@
<td><s:text name="bookmarkForm.priority" /></td>
<td><s:textfield name="bean.priority" maxlength="255" size="5" /></td>
</tr>
-
- <tr>
- <td><s:text name="bookmarkForm.weight" /></td>
- <td><s:textfield name="bean.weight" maxlength="255" size="5" /></td>
- </tr>
-
+
</table>
<p>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderAdd.jsp Mon Mar 10 03:02:38 2014
@@ -33,11 +33,6 @@
<td><s:text name="folderForm.name" /></td>
<td><s:textfield name="bean.name" size="70" maxlength="255" /></td>
</tr>
-
- <tr>
- <td><s:text name="folderForm.description" /></td>
- <td><s:textarea name="bean.description" rows="5" cols="50" /></td>
- </tr>
</table>
<p>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp Mon Mar 10 03:02:38 2014
@@ -37,11 +37,6 @@
<td><s:text name="folderForm.name" /></td>
<td><s:textfield name="bean.name" size="70" maxlength="255" /></td>
</tr>
-
- <tr>
- <td><s:text name="folderForm.description" /></td>
- <td><s:textarea name="bean.description" rows="5" cols="50" /></td>
- </tr>
</table>
<p>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm Mon Mar 10 03:02:38 2014
@@ -506,8 +506,7 @@ Show bookmarks as a HTML ul list.
src="$url.absoluteSite/images/smrssbadge.gif"
alt="$text.get("macro.bookmark.urlFeed")"/></a>
#end
- <a href="$bookmark.url" title="$bookmark.description"
- class="rBookmark$bookmark.weight">$bookmark.name</a>
+ <a href="$bookmark.url" title="$bookmark.description">$bookmark.name</a>
#end
</li>
#end
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java Mon Mar 10 03:02:38 2014
@@ -87,7 +87,7 @@ public class BookmarkTest extends TestCa
testWeblog = TestUtils.getManagedWebsite(testWeblog);
WeblogBookmarkFolder root = bmgr.getDefaultFolder(testWeblog);
- WeblogBookmarkFolder folder = new WeblogBookmarkFolder("TestFolder2", null, TestUtils.getManagedWebsite(testWeblog));
+ WeblogBookmarkFolder folder = new WeblogBookmarkFolder("TestFolder2", TestUtils.getManagedWebsite(testWeblog));
bmgr.saveFolder(folder);
TestUtils.endSession(true);
@@ -101,7 +101,6 @@ public class BookmarkTest extends TestCa
"created by testBookmarkCRUD()",
"http://www.example.com",
"http://www.example.com/rss.xml",
- 1,
12,
"test.jpg");
bookmark1.setFolder(folder);
@@ -114,7 +113,6 @@ public class BookmarkTest extends TestCa
"created by testBookmarkCRUD()",
"http://www.example.com",
"http://www.example.com/rss.xml",
- 1,
12,
"test.jpf");
bookmark2.setFolder(folder);
@@ -165,11 +163,11 @@ public class BookmarkTest extends TestCa
WeblogBookmarkFolder root = bmgr.getDefaultFolder(testWeblog);
// add some folders
- WeblogBookmarkFolder f1 = new WeblogBookmarkFolder("f1", null, TestUtils.getManagedWebsite(testWeblog));
+ WeblogBookmarkFolder f1 = new WeblogBookmarkFolder("f1", TestUtils.getManagedWebsite(testWeblog));
bmgr.saveFolder(f1);
- WeblogBookmarkFolder f2 = new WeblogBookmarkFolder("f2", null, TestUtils.getManagedWebsite(testWeblog));
+ WeblogBookmarkFolder f2 = new WeblogBookmarkFolder("f2", TestUtils.getManagedWebsite(testWeblog));
bmgr.saveFolder(f2);
- WeblogBookmarkFolder f3 = new WeblogBookmarkFolder("f3", null, TestUtils.getManagedWebsite(testWeblog));
+ WeblogBookmarkFolder f3 = new WeblogBookmarkFolder("f3", TestUtils.getManagedWebsite(testWeblog));
bmgr.saveFolder(f3);
TestUtils.endSession(true);
@@ -181,17 +179,17 @@ public class BookmarkTest extends TestCa
WeblogBookmark b1 = new WeblogBookmark(
f1, "b1", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, 1, "image.gif");
+ 1, "image.gif");
bmgr.saveBookmark(b1);
WeblogBookmark b2 = new WeblogBookmark(
f1, "b2", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, 1, "image.gif");
+ 1, "image.gif");
bmgr.saveBookmark(b2);
WeblogBookmark b3 = new WeblogBookmark(
f2, "b3", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, 1, "image.gif");
+ 1, "image.gif");
bmgr.saveBookmark(b3);
TestUtils.endSession(true);
@@ -235,40 +233,40 @@ public class BookmarkTest extends TestCa
testWeblog = TestUtils.getManagedWebsite(testWeblog);
WeblogBookmarkFolder root = bmgr.getDefaultFolder(testWeblog);
- WeblogBookmarkFolder dest = new WeblogBookmarkFolder("dest", null, testWeblog);
+ WeblogBookmarkFolder dest = new WeblogBookmarkFolder("dest", testWeblog);
bmgr.saveFolder(dest);
// create source folder f1
- WeblogBookmarkFolder f1 = new WeblogBookmarkFolder("f1", null, testWeblog);
+ WeblogBookmarkFolder f1 = new WeblogBookmarkFolder("f1", testWeblog);
bmgr.saveFolder(f1);
// create bookmark b1 inside source folder f1
WeblogBookmark b1 = new WeblogBookmark(
f1, "b1", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, 1, "image.gif");
+ 1, "image.gif");
f1.addBookmark(b1);
// create folder f2 inside f1
- WeblogBookmarkFolder f2 = new WeblogBookmarkFolder("f2", null, testWeblog);
+ WeblogBookmarkFolder f2 = new WeblogBookmarkFolder("f2", testWeblog);
bmgr.saveFolder(f2);
// create bookmark b2 inside folder f2
WeblogBookmark b2 = new WeblogBookmark(
f2, "b2", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, 1, "image.gif");
+ 1, "image.gif");
f2.addBookmark(b2);
// create folder f3 inside folder f2
- WeblogBookmarkFolder f3 = new WeblogBookmarkFolder("f3", null, testWeblog);
+ WeblogBookmarkFolder f3 = new WeblogBookmarkFolder("f3", testWeblog);
bmgr.saveFolder(f3);
// crete bookmark b3 inside folder f3
WeblogBookmark b3 = new WeblogBookmark(
f3, "b3", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, 1, "image.gif");
+ 1, "image.gif");
f3.addBookmark(b3);
TestUtils.endSession(true);
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java Mon Mar 10 03:02:38 2014
@@ -93,7 +93,7 @@ public class FolderCRUDTest extends Test
assertEquals(0, root.getBookmarks().size());
// add a folder
- WeblogBookmarkFolder newFolder = new WeblogBookmarkFolder("folderBasicCRUD", null, TestUtils.getManagedWebsite(testWeblog));
+ WeblogBookmarkFolder newFolder = new WeblogBookmarkFolder("folderBasicCRUD", TestUtils.getManagedWebsite(testWeblog));
bmgr.saveFolder(newFolder);
TestUtils.endSession(true);
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java?rev=1575801&r1=1575800&r2=1575801&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java Mon Mar 10 03:02:38 2014
@@ -120,7 +120,7 @@ public class FolderFunctionalityTest ext
boolean exception = false;
try {
// child folder with same name as first
- WeblogBookmarkFolder dupeFolder = new WeblogBookmarkFolder(testFolder.getName(), null, testWeblog);
+ WeblogBookmarkFolder dupeFolder = new WeblogBookmarkFolder(testFolder.getName(), testWeblog);
bmgr.saveFolder(dupeFolder);
TestUtils.endSession(true);
} catch (Throwable e) {