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/07/24 05:25:48 UTC
svn commit: r1612987 - 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/business/themes/
main/java/org/apache/roller/weblogger/pojos/ main/java/or...
Author: gmazza
Date: Thu Jul 24 03:25:47 2014
New Revision: 1612987
URL: http://svn.apache.org/r1612987
Log:
Removal of seven unused columns from WEBLOG table, renaming of two others. Holding off on custom stylesheet column in weblog table for now.
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/JPAWeblogEntryManagerImpl.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/business/themes/WeblogCustomTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
roller/trunk/app/src/main/resources/ApplicationResources.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_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.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/core/CreateWeblog.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.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=1612987&r1=1612986&r2=1612987&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 Thu Jul 24 03:25:47 2014
@@ -246,12 +246,11 @@ public final class TestUtils {
Weblog testWeblog = new Weblog();
testWeblog.setName("Test Weblog");
- testWeblog.setDescription("Test Weblog");
+ testWeblog.setTagline("Test Weblog");
testWeblog.setHandle(handle);
testWeblog.setEmailAddress("testweblog@dev.null");
testWeblog.setEditorPage("editor-text.jsp");
testWeblog.setBlacklist("");
- testWeblog.setEmailFromAddress("");
testWeblog.setEditorTheme("basic");
testWeblog.setLocale("en_US");
testWeblog.setTimeZone("America/Los_Angeles");
@@ -364,7 +363,7 @@ public final class TestUtils {
*/
public static WeblogEntry setupWeblogEntry(String anchor, Weblog weblog, User user) throws Exception {
- return TestUtils.setupWeblogEntry(anchor, weblog.getDefaultCategory(), PubStatus.PUBLISHED,
+ return TestUtils.setupWeblogEntry(anchor, weblog.getWeblogCategories().iterator().next(), PubStatus.PUBLISHED,
weblog, user);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java Thu Jul 24 03:25:47 2014
@@ -115,7 +115,7 @@ public class JPAWeblogEntryManagerImpl i
this.strategy.remove(cat);
if(cat.equals(cat.getWeblog().getBloggerCategory())) {
- cat.getWeblog().setBloggerCategory(cat.getWeblog().getDefaultCategory());
+ cat.getWeblog().setBloggerCategory(null);
this.strategy.store(cat.getWeblog());
}
@@ -385,7 +385,7 @@ public class JPAWeblogEntryManagerImpl i
queryString.append("e.website.id = ?").append(size);
} else {
params.add(size++, Boolean.TRUE);
- queryString.append("e.website.enabled = ?").append(size);
+ queryString.append("e.website.visible = ?").append(size);
}
if (wesc.getUser() != null) {
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=1612987&r1=1612986&r2=1612987&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 Thu Jul 24 03:25:47 2014
@@ -348,7 +348,7 @@ public class JPAWeblogManagerImpl implem
/**
* Return website specified by handle.
*/
- public Weblog getWeblogByHandle(String handle, Boolean enabled)
+ public Weblog getWeblogByHandle(String handle, Boolean visible)
throws WebloggerException {
if (handle==null) {
@@ -359,11 +359,10 @@ public class JPAWeblogManagerImpl implem
// NOTE: if we ever allow changing handles then this needs updating
if(this.weblogHandleToIdMap.containsKey(handle)) {
- Weblog weblog = this.getWeblog(
- this.weblogHandleToIdMap.get(handle));
- if(weblog != null) {
+ Weblog weblog = this.getWeblog(this.weblogHandleToIdMap.get(handle));
+ if (weblog != null) {
// only return weblog if enabled status matches
- if(enabled == null || enabled.equals(weblog.getEnabled())) {
+ if(visible == null || visible.equals(weblog.getVisible())) {
log.debug("weblogHandleToId CACHE HIT - "+handle);
return weblog;
}
@@ -389,7 +388,7 @@ public class JPAWeblogManagerImpl implem
}
if(website != null &&
- (enabled == null || enabled.equals(website.getEnabled()))) {
+ (visible == null || visible.equals(website.getVisible()))) {
return website;
} else {
return null;
@@ -433,7 +432,7 @@ public class JPAWeblogManagerImpl implem
whereClause.append(" AND ");
}
params.add(size++, enabled);
- whereClause.append(" w.enabled = ?").append(size);
+ whereClause.append(" w.visible = ?").append(size);
}
if (active != null) {
if (whereClause.length() > 0) {
@@ -467,7 +466,7 @@ public class JPAWeblogManagerImpl implem
List<WeblogPermission> perms = roller.getUserManager().getWeblogPermissions(user);
for (WeblogPermission perm : perms) {
Weblog weblog = perm.getWeblog();
- if ((!enabledOnly || weblog.getEnabled()) && BooleanUtils.isTrue(weblog.getActive())) {
+ if ((!enabledOnly || weblog.getVisible()) && BooleanUtils.isTrue(weblog.getActive())) {
weblogs.add(weblog);
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java Thu Jul 24 03:25:47 2014
@@ -88,7 +88,7 @@ public class WeblogCustomTheme extends W
public ThemeTemplate getStylesheet() throws WebloggerException {
return getTemplateByLink(this.weblog.getCustomStylesheetPath());
}
-
+
/**
* Lookup the default template.
@@ -108,7 +108,6 @@ public class WeblogCustomTheme extends W
if (action == null) {
return null;
}
-
return WebloggerFactory.getWeblogger().getWeblogManager().getPageByAction(this.weblog, action);
}
@@ -121,7 +120,6 @@ public class WeblogCustomTheme extends W
if (name == null) {
return null;
}
-
return WebloggerFactory.getWeblogger().getWeblogManager().getPageByName(this.weblog, name);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java Thu Jul 24 03:25:47 2014
@@ -59,21 +59,17 @@ public class Weblog implements Serializa
private String id = UUIDGenerator.generateUUID();
private String handle = null;
private String name = null;
- private String description = null;
- private String defaultPageId = "dummy";
- private String weblogDayPageId = "dummy";
+ private String tagline = null;
private Boolean enableBloggerApi = Boolean.TRUE;
private String editorPage = null;
private String blacklist = null;
private Boolean allowComments = Boolean.TRUE;
private Boolean emailComments = Boolean.FALSE;
- private String emailFromAddress = null;
private String emailAddress = null;
private String editorTheme = null;
private String locale = null;
private String timeZone = null;
- private String defaultPlugins = null;
- private Boolean enabled = Boolean.TRUE;
+ private Boolean visible = Boolean.TRUE;
private Boolean active = Boolean.TRUE;
private Date dateCreated = new java.util.Date();
private Boolean defaultAllowComments = Boolean.TRUE;
@@ -81,14 +77,12 @@ public class Weblog implements Serializa
private Boolean moderateComments = Boolean.FALSE;
private int entryDisplayCount = 15;
private Date lastModified = new Date();
- private String pageModels;
private boolean enableMultiLang = false;
private boolean showAllLangs = true;
private String customStylesheetPath = null;
private String iconPath = null;
private String about = null;
private String creator = null;
-
private String analyticsCode = null;
// Associated objects
@@ -111,7 +105,6 @@ public class Weblog implements Serializa
String name,
String desc,
String email,
- String emailFrom,
String editorTheme,
String locale,
String timeZone) {
@@ -119,9 +112,8 @@ public class Weblog implements Serializa
this.handle = handle;
this.creator = creator;
this.name = name;
- this.description = desc;
+ this.tagline = desc;
this.emailAddress = email;
- this.emailFromAddress = emailFrom;
this.editorTheme = editorTheme;
this.locale = locale;
this.timeZone = timeZone;
@@ -228,12 +220,12 @@ public class Weblog implements Serializa
* Description
*
*/
- public String getDescription() {
- return this.description;
+ public String getTagline() {
+ return this.tagline;
}
- public void setDescription(String description) {
- this.description = description;
+ public void setTagline(String tagline) {
+ this.tagline = tagline;
}
/**
@@ -258,29 +250,7 @@ public class Weblog implements Serializa
public void setCreatorUserName(String creatorUserName) {
creator = creatorUserName;
}
-
- public String getDefaultPageId() {
- return this.defaultPageId;
- }
-
- public void setDefaultPageId(String defaultPageId) {
- this.defaultPageId = defaultPageId;
- }
-
- /**
- * @deprecated
- */
- public String getWeblogDayPageId() {
- return this.weblogDayPageId;
- }
-
- /**
- * @deprecated
- */
- public void setWeblogDayPageId(String weblogDayPageId) {
- this.weblogDayPageId = weblogDayPageId;
- }
-
+
public Boolean getEnableBloggerApi() {
return this.enableBloggerApi;
}
@@ -289,24 +259,12 @@ public class Weblog implements Serializa
this.enableBloggerApi = enableBloggerApi;
}
- public WeblogCategory getBloggerCategory() {
- if (bloggerCategory == null) {
- bloggerCategory = getDefaultCategory();
- }
- return bloggerCategory;
- }
+ public WeblogCategory getBloggerCategory() { return bloggerCategory; }
public void setBloggerCategory(WeblogCategory bloggerCategory) {
this.bloggerCategory = bloggerCategory;
}
- public WeblogCategory getDefaultCategory() {
- if (weblogCategories.size() == 0) {
- return null;
- }
- return weblogCategories.iterator().next();
- }
-
public String getEditorPage() {
return this.editorPage;
}
@@ -363,14 +321,6 @@ public class Weblog implements Serializa
this.emailComments = emailComments;
}
- public String getEmailFromAddress() {
- return this.emailFromAddress;
- }
-
- public void setEmailFromAddress(String emailFromAddress) {
- this.emailFromAddress = emailFromAddress;
- }
-
public String getEmailAddress() {
return this.emailAddress;
}
@@ -429,17 +379,6 @@ public class Weblog implements Serializa
}
/**
- * Comma-delimited list of user's default Plugins.
- */
- public String getDefaultPlugins() {
- return defaultPlugins;
- }
-
- public void setDefaultPlugins(String string) {
- defaultPlugins = string;
- }
-
- /**
* Set bean properties based on other bean.
*/
public void setData(Weblog other) {
@@ -447,10 +386,8 @@ public class Weblog implements Serializa
this.setId(other.getId());
this.setName(other.getName());
this.setHandle(other.getHandle());
- this.setDescription(other.getDescription());
+ this.setTagline(other.getTagline());
this.setCreatorUserName(other.getCreatorUserName());
- this.setDefaultPageId(other.getDefaultPageId());
- this.setWeblogDayPageId(other.getWeblogDayPageId());
this.setEnableBloggerApi(other.getEnableBloggerApi());
this.setBloggerCategory(other.getBloggerCategory());
this.setEditorPage(other.getEditorPage());
@@ -458,12 +395,10 @@ public class Weblog implements Serializa
this.setAllowComments(other.getAllowComments());
this.setEmailComments(other.getEmailComments());
this.setEmailAddress(other.getEmailAddress());
- this.setEmailFromAddress(other.getEmailFromAddress());
this.setEditorTheme(other.getEditorTheme());
this.setLocale(other.getLocale());
this.setTimeZone(other.getTimeZone());
- this.setDefaultPlugins(other.getDefaultPlugins());
- this.setEnabled(other.getEnabled());
+ this.setVisible(other.getVisible());
this.setDateCreated(other.getDateCreated());
this.setEntryDisplayCount(other.getEntryDisplayCount());
this.setActive(other.getActive());
@@ -563,12 +498,12 @@ public class Weblog implements Serializa
/**
* Set to FALSE to completely disable and hide this weblog from public view.
*/
- public Boolean getEnabled() {
- return this.enabled;
+ public Boolean getVisible() {
+ return this.visible;
}
- public void setEnabled(Boolean enabled) {
- this.enabled = enabled;
+ public void setVisible(Boolean visible) {
+ this.visible = visible;
}
/**
@@ -650,18 +585,6 @@ public class Weblog implements Serializa
}
/**
- * Comma-separated list of additional page models to be created when this
- * weblog is rendered.
- */
- public String getPageModels() {
- return pageModels;
- }
- public void setPageModels(String pageModels) {
- this.pageModels = pageModels;
- }
-
-
- /**
* The path under the weblog's resources to a stylesheet override.
*/
public String getCustomStylesheetPath() {
@@ -671,8 +594,7 @@ public class Weblog implements Serializa
public void setCustomStylesheetPath(String customStylesheetPath) {
this.customStylesheetPath = customStylesheetPath;
}
-
-
+
/**
* The path under the weblog's resources to an icon image.
*/
@@ -859,7 +781,6 @@ public class Weblog implements Serializa
* @return Folder object requested.
*/
public WeblogBookmarkFolder getBookmarkFolder(String folderName) {
- WeblogBookmarkFolder ret = null;
try {
Weblogger roller = WebloggerFactory.getWeblogger();
BookmarkManager bmgr = roller.getBookmarkManager();
@@ -871,7 +792,7 @@ public class Weblog implements Serializa
} catch (WebloggerException re) {
log.error("ERROR: fetching folder for weblog", re);
}
- return ret;
+ return null;
}
@@ -900,7 +821,7 @@ public class Weblog implements Serializa
* @return Collection of WeblogEntryTag objects
*/
public List<TagStat> getPopularTags(int sinceDays, int length) {
- List<TagStat> results = new ArrayList();
+ List<TagStat> results = new ArrayList<TagStat>();
Date startDate = null;
if(sinceDays > 0) {
Calendar cal = Calendar.getInstance();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java Thu Jul 24 03:25:47 2014
@@ -107,27 +107,20 @@ public final class WeblogWrapper {
return StringEscapeUtils.escapeHtml4(this.pojo.getName());
}
-
+ /* Deprecated in Roller 5.1 */
public String getDescription() {
- return HTMLSanitizer.conditionallySanitize(this.pojo.getDescription());
+ return getTagline();
}
-
-
+
+ public String getTagline() {
+ return HTMLSanitizer.conditionallySanitize(this.pojo.getTagline());
+ }
+
+
public UserWrapper getCreator() {
return UserWrapper.wrap(this.pojo.getCreator());
}
-
- public String getDefaultPageId() {
- return this.pojo.getDefaultPageId();
- }
-
-
- public String getWeblogDayPageId() {
- return this.pojo.getWeblogDayPageId();
- }
-
-
public Boolean getEnableBloggerApi() {
return this.pojo.getEnableBloggerApi();
}
@@ -137,17 +130,10 @@ public final class WeblogWrapper {
return WeblogCategoryWrapper.wrap(this.pojo.getBloggerCategory(), urlStrategy);
}
-
- public WeblogCategoryWrapper getDefaultCategory() {
- return WeblogCategoryWrapper.wrap(this.pojo.getDefaultCategory(), urlStrategy);
- }
-
-
public String getEditorPage() {
return this.pojo.getEditorPage();
}
-
-
+
public String getBlacklist() {
return this.pojo.getBlacklist();
}
@@ -180,13 +166,7 @@ public final class WeblogWrapper {
public Boolean getEmailComments() {
return this.pojo.getEmailComments();
}
-
-
- public String getEmailFromAddress() {
- return this.pojo.getEmailFromAddress();
- }
-
-
+
public String getEmailAddress() {
return this.pojo.getEmailAddress();
}
@@ -212,11 +192,6 @@ public final class WeblogWrapper {
}
- public String getDefaultPlugins() {
- return this.pojo.getDefaultPlugins();
- }
-
-
public Locale getLocaleInstance() {
return this.pojo.getLocaleInstance();
}
@@ -232,11 +207,15 @@ public final class WeblogWrapper {
}
+ public Boolean getVisible() {
+ return this.pojo.getVisible();
+ }
+
+ /* deprecated in Roller 5.1 */
public Boolean getEnabled() {
- return this.pojo.getEnabled();
+ return getVisible();
}
-
-
+
public Boolean getActive() {
return this.pojo.getActive();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java Thu Jul 24 03:25:47 2014
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.util.Utilities;
@@ -33,25 +32,6 @@ public class ModelLoader {
private static Log log = LogFactory.getLog(ModelLoader.class);
-
- /**
- * Load set of custom models set for the given weblog.
- *
- * Does not fail if there is a problem with one of the models.
- */
- public static void loadCustomModels(Weblog weblog, Map<String, Object> modelMap, Map initData) {
-
- if (weblog.getPageModels() != null) {
- try {
- loadModels(weblog.getPageModels(), modelMap, initData, false);
- } catch(WebloggerException ex) {
- // shouldn't happen, but log it just in case
- log.error("Error loading weblog custom models", ex);
- }
- }
- }
-
-
/**
* Convenience method to load a comma-separated list of page models.
*
@@ -84,7 +64,7 @@ public class ModelLoader {
}
} catch (InstantiationException ie) {
if(fail) {
- throw new WebloggerException("Error insantiating model: " + model, ie);
+ throw new WebloggerException("Error instantiating model: " + model, ie);
} else {
log.warn("Error instantiating model: " + model);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Thu Jul 24 03:25:47 2014
@@ -260,9 +260,6 @@ public class FeedServlet extends HttpSer
ModelLoader.loadModels(siteModels, model, initData, true);
}
- // Load weblog custom models
- ModelLoader.loadCustomModels(weblog, model, initData);
-
// Load search models if search feed
if ("entries".equals(feedRequest.getType())
&& feedRequest.getTerm() != null) {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Thu Jul 24 03:25:47 2014
@@ -467,9 +467,6 @@ public class PageServlet extends HttpSer
ModelLoader.loadModels(siteModels, model, initData, true);
}
- // Load weblog custom models
- ModelLoader.loadCustomModels(weblog, model, initData);
-
} catch (WebloggerException ex) {
log.error("Error loading model objects for page", ex);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java Thu Jul 24 03:25:47 2014
@@ -81,9 +81,9 @@ public class PreviewServlet extends Http
log.debug("Entering");
- Weblog weblog = null;
+ Weblog weblog;
- WeblogPreviewRequest previewRequest = null;
+ WeblogPreviewRequest previewRequest;
try {
previewRequest = new WeblogPreviewRequest(request);
@@ -232,9 +232,6 @@ public class PreviewServlet extends Http
ModelLoader.loadModels(siteModels, model, initData, true);
}
- // Load weblog custom models
- ModelLoader.loadCustomModels(weblog, model, initData);
-
} catch (WebloggerException ex) {
log.error("ERROR loading model for page", ex);
@@ -247,7 +244,7 @@ public class PreviewServlet extends Http
// lookup Renderer we are going to use
- Renderer renderer = null;
+ Renderer renderer;
try {
log.debug("Looking up renderer");
renderer = RendererManager.getRenderer(page, deviceType);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java Thu Jul 24 03:25:47 2014
@@ -219,9 +219,6 @@ public class SearchServlet extends HttpS
ModelLoader.loadModels(siteModels, model, initData, true);
}
- // Load weblog custom models
- ModelLoader.loadCustomModels(weblog, model, initData);
-
} catch (WebloggerException ex) {
log.error("Error loading model objects for page", ex);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Thu Jul 24 03:25:47 2014
@@ -116,7 +116,6 @@ public class CreateWeblog extends UIActi
getBean().getName(),
getBean().getDescription(),
getBean().getEmailAddress(),
- getBean().getEmailAddress(),
getBean().getTheme(),
getBean().getLocale(),
getBean().getTimeZone());
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java Thu Jul 24 03:25:47 2014
@@ -97,13 +97,6 @@ public final class EntryAdd extends Entr
getBean().setAllowComments(getActionWeblog().getDefaultAllowComments());
getBean().setCommentDays(getActionWeblog().getDefaultCommentDays());
- // apply weblog default plugins
- if (getActionWeblog().getDefaultPlugins() != null) {
- getBean().setPlugins(
- StringUtils.split(getActionWeblog().getDefaultPlugins(),
- ","));
- }
-
return INPUT;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java Thu Jul 24 03:25:47 2014
@@ -118,7 +118,6 @@ public class TemplateRemove extends UIAc
// Clear for next custom theme
weblog.setCustomStylesheetPath(null);
- weblog.setDefaultPageId(null);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Thu Jul 24 03:25:47 2014
@@ -187,7 +187,6 @@ public class Templates extends UIAction
// scratch then make sure and set the defaultPageId. What does
// this do????
if (WeblogTemplate.DEFAULT_PAGE.equals(newTemplate.getName())) {
- getActionWeblog().setDefaultPageId(newTemplate.getId());
WebloggerFactory.getWeblogger().getWeblogManager()
.saveWeblog(getActionWeblog());
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java Thu Jul 24 03:25:47 2014
@@ -78,9 +78,9 @@ public class TemplatesRemove extends UIA
String[] idsToDelete = getIdSelections();
if (idsToDelete != null && idsToDelete.length > 0) {
- for (int i = 0; i < idsToDelete.length; i++) {
- if (!idsToDelete[i].equals("")) {
- template = mgr.getPage(idsToDelete[i]);
+ for (String id : idsToDelete) {
+ if (!id.equals("")) {
+ template = mgr.getPage(id);
if (template != null) {
pages.add(template);
}
@@ -135,12 +135,11 @@ public class TemplatesRemove extends UIA
.getWeblogManager();
Weblog weblog = getActionWeblog();
- WeblogTemplate template = null;
+ WeblogTemplate template;
- for (int i = 0; i < idsToDelete.length; i++) {
- if (!idsToDelete[i].equals("")) {
-
- template = mgr.getPage(idsToDelete[i]);
+ for (String id : idsToDelete) {
+ if (!id.equals("")) {
+ template = mgr.getPage(id);
if (!template.isRequired()
|| !WeblogTemplate.ACTION_CUSTOM
.equals(getActionWeblog()
@@ -175,12 +174,9 @@ public class TemplatesRemove extends UIA
// Clear for next custom theme
weblog.setCustomStylesheetPath(null);
- weblog.setDefaultPageId(null);
}
-
mgr.removePage(template);
-
}
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java Thu Jul 24 03:25:47 2014
@@ -29,7 +29,7 @@ public class WeblogConfigBean {
private String handle = null;
private String name = null;
- private String description = null;
+ private String tagline = null;
private boolean enableBloggerApi = false;
private String editorPage = null;
private String blacklist = null;
@@ -38,24 +38,20 @@ public class WeblogConfigBean {
private String defaultCommentDays = "0";
private boolean moderateComments = false;
private boolean emailComments = false;
- private String emailFromAddress = null;
private String emailAddress = null;
private String locale = null;
private String timeZone = null;
- private String defaultPlugins = null;
private int entryDisplayCount = 15;
private boolean active = true;
private boolean commentModerationRequired = false;
private boolean enableMultiLang = false;
private boolean showAllLangs = true;
- private String pageModels = null;
private String icon = null;
private String about = null;
private String analyticsCode = null;
private String bloggerCategoryId = null;
- private String[] defaultPluginsArray = null;
private boolean applyCommentDefaults = false;
@@ -75,12 +71,12 @@ public class WeblogConfigBean {
this.name = name;
}
- public String getDescription() {
- return this.description;
+ public String getTagline() {
+ return this.tagline;
}
- public void setDescription( String description ) {
- this.description = description;
+ public void setTagline( String tagline ) {
+ this.tagline = tagline;
}
public boolean getEnableBloggerApi() {
@@ -147,14 +143,6 @@ public class WeblogConfigBean {
this.emailComments = emailComments;
}
- public String getEmailFromAddress() {
- return this.emailFromAddress;
- }
-
- public void setEmailFromAddress( String emailFromAddress ) {
- this.emailFromAddress = emailFromAddress;
- }
-
public String getEmailAddress() {
return this.emailAddress;
}
@@ -211,14 +199,6 @@ public class WeblogConfigBean {
this.showAllLangs = showAllLangs;
}
- public String getPageModels() {
- return this.pageModels;
- }
-
- public void setPageModels( String pageModels ) {
- this.pageModels = pageModels;
- }
-
public String getIcon() {
return icon;
}
@@ -243,14 +223,6 @@ public class WeblogConfigBean {
this.bloggerCategoryId = bloggerCategoryId;
}
- public String[] getDefaultPluginsArray() {
- return defaultPluginsArray;
- }
-
- public void setDefaultPluginsArray(String[] strings) {
- defaultPluginsArray = strings;
- }
-
public boolean getApplyCommentDefaults() {
return applyCommentDefaults;
}
@@ -279,7 +251,7 @@ public class WeblogConfigBean {
this.handle = dataHolder.getHandle();
this.name = dataHolder.getName();
- this.description = dataHolder.getDescription();
+ this.tagline = dataHolder.getTagline();
this.enableBloggerApi = dataHolder.getEnableBloggerApi();
this.editorPage = dataHolder.getEditorPage();
this.blacklist = dataHolder.getBlacklist();
@@ -288,33 +260,26 @@ public class WeblogConfigBean {
this.defaultCommentDays = ""+dataHolder.getDefaultCommentDays();
this.moderateComments = dataHolder.getModerateComments();
this.emailComments = dataHolder.getEmailComments();
- this.emailFromAddress = dataHolder.getEmailFromAddress();
this.emailAddress = dataHolder.getEmailAddress();
this.locale = dataHolder.getLocale();
this.timeZone = dataHolder.getTimeZone();
- this.defaultPlugins = dataHolder.getDefaultPlugins();
this.entryDisplayCount = dataHolder.getEntryDisplayCount();
setActive(dataHolder.getActive());
this.commentModerationRequired = dataHolder.getCommentModerationRequired();
this.enableMultiLang = dataHolder.isEnableMultiLang();
this.showAllLangs = dataHolder.isShowAllLangs();
- this.pageModels = dataHolder.getPageModels();
this.analyticsCode = dataHolder.getAnalyticsCode();
setIcon(dataHolder.getIconPath());
setAbout(dataHolder.getAbout());
if (dataHolder.getBloggerCategory() != null) {
bloggerCategoryId = dataHolder.getBloggerCategory().getId();
}
- if (dataHolder.getDefaultPlugins() != null) {
- defaultPluginsArray = StringUtils.split(dataHolder.getDefaultPlugins(), ",");
- }
}
public void copyTo(Weblog dataHolder) {
-
dataHolder.setName(this.name);
- dataHolder.setDescription(this.description);
+ dataHolder.setTagline(this.tagline);
dataHolder.setEnableBloggerApi(this.enableBloggerApi);
dataHolder.setEditorPage(this.editorPage);
dataHolder.setBlacklist(this.blacklist);
@@ -322,26 +287,18 @@ public class WeblogConfigBean {
dataHolder.setDefaultAllowComments(this.defaultAllowComments);
dataHolder.setModerateComments(this.moderateComments);
dataHolder.setEmailComments(this.emailComments);
- dataHolder.setEmailFromAddress(this.emailFromAddress);
dataHolder.setEmailAddress(this.emailAddress);
dataHolder.setLocale(this.locale);
dataHolder.setTimeZone(this.timeZone);
- dataHolder.setDefaultPlugins(this.defaultPlugins);
dataHolder.setEntryDisplayCount(this.entryDisplayCount);
dataHolder.setActive(this.getActive());
dataHolder.setCommentModerationRequired(this.commentModerationRequired);
dataHolder.setEnableMultiLang(this.enableMultiLang);
dataHolder.setShowAllLangs(this.showAllLangs);
- dataHolder.setPageModels(this.pageModels);
dataHolder.setIconPath(getIcon());
dataHolder.setAbout(getAbout());
dataHolder.setAnalyticsCode(this.analyticsCode);
-
- dataHolder.setDefaultPlugins( StringUtils.join(this.defaultPluginsArray,",") );
-
dataHolder.setDefaultCommentDays(Integer.parseInt(this.defaultCommentDays));
-
- dataHolder.setDefaultPlugins(StringUtils.join(this.defaultPluginsArray, ","));
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/MailUtil.java Thu Jul 24 03:25:47 2014
@@ -434,7 +434,7 @@ public class MailUtil {
// send message to email recipients
try {
// use either the weblog configured from address or the site configured from address
- String from = weblog.getEmailFromAddress();
+ String from = weblog.getEmailAddress();
if(StringUtils.isEmpty(from)) {
from = user.getEmailAddress();
}
@@ -523,7 +523,7 @@ public class MailUtil {
User user = entry.getCreator();
// use either the weblog configured from address or the site configured from address
- String from = weblog.getEmailFromAddress();
+ String from = weblog.getEmailAddress();
if(StringUtils.isEmpty(from)) {
from = user.getEmailAddress();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java Thu Jul 24 03:25:47 2014
@@ -94,7 +94,7 @@ public class OpenSearchServlet extends H
} else {
shortName = StringEscapeUtils.escapeXml(weblog.getName());
- description = StringEscapeUtils.escapeXml(weblog.getDescription());
+ description = StringEscapeUtils.escapeXml(weblog.getTagline());
contact = StringEscapeUtils.escapeXml(weblog.getEmailAddress());
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java Thu Jul 24 03:25:47 2014
@@ -126,7 +126,7 @@ public class BaseAPIHandler implements S
website = weblogMgr.getWeblogByHandle(blogid);
if (website != null) {
weblogFound = true;
- weblogEnabled = website.getEnabled();
+ weblogEnabled = website.getVisible();
apiEnabled = website.getEnableBloggerApi()
&& WebloggerRuntimeConfig.getBooleanProperty("webservices.enableXmlRpc");
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Thu Jul 24 03:25:47 2014
@@ -266,11 +266,6 @@ public class MetaWeblogAPIHandler extend
entry.setCommentDays(website.getDefaultCommentDays());
entry.setAllowComments(website.getDefaultAllowComments());
- // apply weblog default plugins
- if (website.getDefaultPlugins() != null) {
- entry.setPlugins(website.getDefaultPlugins());
- }
-
if (publish) {
entry.setStatus(PubStatus.PUBLISHED);
} else {
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Thu Jul 24 03:25:47 2014
@@ -29,6 +29,7 @@ generic.description=Description
generic.save=Save
generic.edit=Edit
generic.delete=Delete
+generic.tagline=Tagline
# ------------------------------------------------------------- BookmarkForm.jsp
@@ -1643,7 +1644,6 @@ websiteSettings.tip=Change weblog title,
websiteSettings.generalSettings=General Settings
websiteSettings.websiteTitle=Title
-websiteSettings.websiteDescription=Tagline
websiteSettings.icon=Icon
websiteSettings.about=About your blog
websiteSettings.emailAddress=Email address of weblog owner
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=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Thu Jul 24 03:25:47 2014
@@ -926,7 +926,6 @@ websiteSettings.subtitle=Einstellungen f
# ------------------------------------------------------------------ Weblog edit
websiteSettings.tip=Titel, Beschreibung, Kommentar und Referrer Spam Prevention Einstellungen des Weblogs \u00E4ndern.
websiteSettings.title=Website Einstellungen
-websiteSettings.websiteDescription=Beschreibung
websiteSettings.websiteTitle=Titel
welcome.accountCreated=Ihr neuer Benutzer-Login wurde angelegt.
welcome.clickHere=Klicken Sie hier
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=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Thu Jul 24 03:25:47 2014
@@ -534,7 +534,6 @@ websiteSettings.title=Configuraci\u00F3n
websiteSettings.subtitle=Administrar la configuraci\u00F3n del weblog <span>{0}</span>
websiteSettings.tip=Cambiar t\u00EDtulo del weblog, descripci\u00F3n, configuraci\u00F3n de prevenci\u00F3n de spam en comentarios y referencias.
websiteSettings.websiteTitle=T\u00EDtulo
-websiteSettings.websiteDescription=Descripci\u00F3n
websiteSettings.editor=P\u00E1gina de editor que utilizar
websiteSettings.formatting=Formateando
websiteSettings.allowComments=\u00BFPermitir comentarios en el weblog?
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Thu Jul 24 03:25:47 2014
@@ -1093,7 +1093,6 @@ ainsi que gérer les réferrants et
websiteSettings.generalSettings=Paramètres généraux
websiteSettings.websiteTitle=Titre
-websiteSettings.websiteDescription=Description
websiteSettings.emailAddress=Adresse de courriel du propriétaire du blog
websiteSettings.editor=Editeur de texte à utiliser
websiteSettings.entryDisplayCount=Nombre de publications à afficher sur la page principale
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=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Thu Jul 24 03:25:47 2014
@@ -843,7 +843,6 @@ websiteSettings.tip=\u30D6\u30ED\u30B0\u
websiteSettings.generalSettings=\u5168\u822C
websiteSettings.websiteTitle=\u30D6\u30ED\u30B0\u30BF\u30A4\u30C8\u30EB
-websiteSettings.websiteDescription=\u8A73\u7D30
websiteSettings.emailAddress=\u30D6\u30ED\u30B0\u30AA\u30FC\u30CA\u30FC\u306E\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
websiteSettings.editor=\u4F7F\u7528\u3059\u308B\u30A8\u30C7\u30A3\u30BF\u30DA\u30FC\u30B8
websiteSettings.entryDisplayCount=\u30A8\u30F3\u30C8\u30EA\u8868\u793A\u6570
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Thu Jul 24 03:25:47 2014
@@ -1227,7 +1227,6 @@ websiteSettings.tip=\uc6f9\ub85c\uadf8 \
websiteSettings.generalSettings=\uc77c\ubc18 \uc124\uc815 \uc815\ubcf4
websiteSettings.websiteTitle=\uc81c\ubaa9
-websiteSettings.websiteDescription=\ud0dc\uadf8\ub77c\uc778
websiteSettings.icon=\uc544\uc774\ucf58
websiteSettings.about=\ube14\ub85c\uadf8 \uc815\ubcf4
websiteSettings.emailAddress=\uc6f9\ub85c\uadf8 \uc18c\uc720\uc790\uc758 \uc804\uc790\uc6b0\ud3b8 \uc8fc\uc18c
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=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Thu Jul 24 03:25:47 2014
@@ -827,7 +827,6 @@ websiteSettings.subtitle = \u041c\u0435\
websiteSettings.tip = \u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u0430 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0430, \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435, \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439 \u0438 referrer \
\u0410\u043d\u0442\u0438\u0441\u043f\u0430\u043c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438.
websiteSettings.websiteTitle = \u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a
-websiteSettings.websiteDescription = \u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
websiteSettings.templateSettings = \u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0448\u0430\u0431\u043b\u043e\u043d\u0430
websiteSettings.homePage = \u0421\u0442\u0440\u0430\u043d\u0438\u0446\u0430, \u043a\u043e\u0442\u043e\u0440\u0443\u044e \u043d\u0443\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043a\u0430\u043a \u0434\u043e\u043c\u0430\u0448\u043d\u044e\u044e
websiteSettings.editor = Weblog \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430, \u043a\u043e\u0442\u043e\u0440\u0443\u044e \u043d\u0443\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c
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=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Thu Jul 24 03:25:47 2014
@@ -588,7 +588,6 @@ websiteSettings.spamPrevention=\u963b\u6
websiteSettings.subtitle=\u7ba1\u7406\u7f51\u5fd7 [{0}] \u8bbe\u7f6e
websiteSettings.tip=\u66f4\u6539\u7f51\u5fd7\u6807\u9898\u3001\u63cf\u8ff0\u3001\u8bc4\u8bba\u548c\u5783\u573e\u8bc4\u8bba\u8fc7\u6ee4\u7b49\u8bbe\u7f6e\u3002
websiteSettings.title=\u7f51\u5fd7\u8bbe\u7f6e
-websiteSettings.websiteDescription=\u63cf\u8ff0
websiteSettings.websiteTitle=\u6807\u9898
welcome.accountCreated=\u606d\u559c\uff0c\u60a8\u7684\u7528\u6237\u5e10\u53f7\u5df2\u7ecf\u5efa\u7acb\u3002
welcome.clickHere=\u70b9\u51fb\u8fd9\u91cc
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml Thu Jul 24 03:25:47 2014
@@ -17,12 +17,12 @@
</named-query>
<named-query name="Weblog.getByEndDate&StartDate&Enabled&ActiveOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
- AND w.enabled = ?3 AND w.active = ?4
+ AND w.visible = ?3 AND w.active = ?4
ORDER BY w.dateCreated DESC</query>
</named-query>
<named-query name="Weblog.getByEndDate&StartDate&EnabledOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
- AND w.enabled = ?3
+ AND w.visible = ?3
ORDER BY w.dateCreated DESC</query>
</named-query>
<named-query name="Weblog.getByEndDate&StartDateOrderByDateCreatedDesc">
@@ -40,12 +40,12 @@
</named-query>
<named-query name="Weblog.getByEndDate&Enabled&ActiveOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1
- AND w.enabled = ?2 AND w.active = ?3
+ AND w.visible = ?2 AND w.active = ?3
ORDER BY w.dateCreated DESC</query>
</named-query>
<named-query name="Weblog.getByEndDate&EnabledOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1
- AND w.enabled = ?2
+ AND w.visible = ?2
ORDER BY w.dateCreated DESC</query>
</named-query>
@@ -77,14 +77,8 @@
<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>
- <basic name="defaultPageId">
- <column name="defaultpageid" insertable="true" updatable="true" unique="false"/>
- </basic>
- <basic name="weblogDayPageId">
- <column name="weblogdayid" insertable="true" updatable="true" unique="false"/>
+ <basic name="tagline">
+ <column name="tagline" insertable="true" updatable="true" unique="false"/>
</basic>
<basic name="enableBloggerApi">
<column name="enablebloggerapi" insertable="true" updatable="true" unique="false"/>
@@ -113,9 +107,6 @@
<basic name="emailComments">
<column name="emailcomments" insertable="true" updatable="true" unique="false"/>
</basic>
- <basic name="emailFromAddress">
- <column name="emailfromaddress" insertable="true" updatable="true" unique="false"/>
- </basic>
<basic name="emailAddress">
<column name="emailaddress" insertable="true" updatable="true" unique="false"/>
</basic>
@@ -132,14 +123,11 @@
<column name="datecreated" insertable="true" updatable="true" unique="false"/>
<temporal>TIMESTAMP</temporal>
</basic>
- <basic name="defaultPlugins">
- <column name="defaultplugins" insertable="true" updatable="true" unique="false"/>
- </basic>
<basic name="entryDisplayCount">
<column name="displaycnt" insertable="true" updatable="true" unique="false"/>
</basic>
- <basic name="enabled">
- <column name="isenabled" insertable="true" updatable="true" unique="false"/>
+ <basic name="visible">
+ <column name="visible" insertable="true" updatable="true" unique="false"/>
</basic>
<basic name="active">
<column name="isactive" insertable="true" updatable="true" unique="false"/>
@@ -157,9 +145,6 @@
<basic name="showAllLangs">
<column name="showalllangs" insertable="true" updatable="true" unique="false"/>
</basic>
- <basic name="pageModels">
- <column name="pagemodels" insertable="true" updatable="true" unique="false"/>
- </basic>
<basic name="customStylesheetPath">
<column name="customstylesheet" insertable="true" updatable="true" unique="false"/>
</basic>
@@ -196,7 +181,6 @@
<transient name="userCount"/>
<transient name="entryCount"/>
<transient name="initializedPlugins"/>
- <transient name="defaultCategory"/>
<transient name="localeInstance"/>
<transient name="timeZoneInstance" />
</attributes>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml Thu Jul 24 03:25:47 2014
@@ -11,7 +11,7 @@
<query>SELECT h FROM WeblogHitCount h WHERE h.weblog = ?1</query>
</named-query>
<named-query name="WeblogHitCount.getByWeblogEnabledTrueAndActiveTrue&DailyHitsGreaterThenZero&WeblogLastModifiedGreaterOrderByDailyHitsDesc">
- <query>SELECT h FROM WeblogHitCount h WHERE h.weblog.enabled = true AND h.weblog.active = true AND h.weblog.lastModified > ?1 AND h.dailyHits > 0 ORDER BY h.dailyHits DESC</query>
+ <query>SELECT h FROM WeblogHitCount h WHERE h.weblog.visible = true AND h.weblog.active = true AND h.weblog.lastModified > ?1 AND h.dailyHits > 0 ORDER BY h.dailyHits DESC</query>
</named-query>
<named-query name="WeblogHitCount.updateDailyHitCountZero">
<query>UPDATE WeblogHitCount h SET h.dailyHits = 0</query>
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=1612987&r1=1612986&r2=1612987&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 Thu Jul 24 03:25:47 2014
@@ -5,6 +5,22 @@ DON'T RUN THIS, IT'S NOT A DATABASE CREA
**#
#renameTable('website' 'weblog')
+#dropColumn('weblog' 'emailfromaddress')
+#dropColumn('weblog' 'pagemodels')
+#dropColumn('weblog' 'defaultcatid')
+#dropColumn('weblog' 'ignorewords')
+#dropColumn('weblog' 'defaultpageid')
+#dropColumn('weblog' 'weblogdayid')
+#dropColumn('weblog' 'defaultplugins')
+#addColumnNotNull('weblog' 'visible' $db.BOOLEAN_SQL_TYPE_TRUE)
+#addColumnNull('weblog' 'tagline' "varchar(255)")
+
+update weblog set visible = isenabled;
+update weblog set tagline = description;
+
+#dropColumn('weblog' 'isenabled')
+#dropColumn('weblog' 'description')
+
#renameTable('folder' 'bookmark_folder')
#renameTable('rolleruser' 'roller_user')
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=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Thu Jul 24 03:25:47 2014
@@ -82,24 +82,18 @@ create table weblog (
id varchar(48) not null primary key,
name varchar(255) not null,
handle varchar(255) not null,
- description varchar(255) not null,
+ tagline varchar(255),
creator varchar(255),
- defaultpageid varchar(48) default '',
- weblogdayid varchar(48) not null,
- ignorewords $db.TEXT_SQL_TYPE,
enablebloggerapi $db.BOOLEAN_SQL_TYPE_FALSE not null,
editorpage varchar(255),
bloggercatid varchar(48),
- defaultcatid varchar(48),
allowcomments $db.BOOLEAN_SQL_TYPE_TRUE not null,
emailcomments $db.BOOLEAN_SQL_TYPE_FALSE not null,
- emailfromaddress varchar(255),
emailaddress varchar(255) not null,
editortheme varchar(255),
locale varchar(20),
timezone varchar(50),
- defaultplugins varchar(255),
- isenabled $db.BOOLEAN_SQL_TYPE_TRUE not null,
+ visible $db.BOOLEAN_SQL_TYPE_TRUE not null,
isactive $db.BOOLEAN_SQL_TYPE_TRUE not null,
datecreated $db.TIMESTAMP_SQL_TYPE not null,
blacklist $db.TEXT_SQL_TYPE,
@@ -108,7 +102,6 @@ create table weblog (
commentmod $db.BOOLEAN_SQL_TYPE_FALSE not null,
displaycnt integer default 15 not null,
lastmodified $db.TIMESTAMP_SQL_TYPE,
- pagemodels varchar(255) default null,
enablemultilang $db.BOOLEAN_SQL_TYPE_FALSE not null,
showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null,
customstylesheet varchar(128),
@@ -116,7 +109,7 @@ create table weblog (
icon varchar(255),
analyticscode $db.TEXT_SQL_TYPE
);
-create index ws_isenabled_idx on weblog(isenabled);
+create index ws_visible_idx on weblog(visible);
alter table weblog add constraint ws_handle_uq unique (handle$!db.INDEXSIZE);
create table weblog_custom_template (
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp Thu Jul 24 03:25:47 2014
@@ -57,7 +57,7 @@ function handlePreview(handle) {
</tr>
<tr>
- <td class="label"><label for="description" /><s:text name="generic.description" /></td>
+ <td class="label"><label for="description" /><s:text name="generic.tagline" /></td>
<td class="field"><s:textfield name="bean.description" size="40" maxlength="255" /></td>
<td class="description"><s:text name="createWebsite.tip.description" /></td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/WeblogConfig.jsp Thu Jul 24 03:25:47 2014
@@ -43,8 +43,8 @@
</tr>
<tr>
- <td class="label"><s:text name="websiteSettings.websiteDescription" /></td>
- <td class="field"><s:textfield name="bean.description" size="40" maxlength="255"/></td>
+ <td class="label"><s:text name="generic.tagline" /></td>
+ <td class="field"><s:textfield name="bean.tagline" size="40" maxlength="255"/></td>
<td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td>
</tr>
@@ -192,7 +192,7 @@
<tr>
<td class="label"><s:text name="websiteSettings.bloggerApiCategory" /></td>
<td class="field">
- <s:select name="bean.bloggerCategoryId" list="weblogCategories" size="1" listKey="id" listValue="path" />
+ <s:select name="bean.bloggerCategoryId" list="weblogCategories" size="1" listKey="id" listValue="name" />
</td>
<td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td>
</tr>
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java Thu Jul 24 03:25:47 2014
@@ -71,7 +71,7 @@ public class CommentTest extends TestCas
try {
testUser = TestUtils.setupUser("commentTestUser");
testWeblog = TestUtils.setupWeblog("commentTestWeblog", testUser);
- testEntry = TestUtils.setupWeblogEntry("commentTestEntry", testWeblog.getDefaultCategory(), testWeblog, testUser);
+ testEntry = TestUtils.setupWeblogEntry("commentTestEntry", testWeblog, testUser);
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -220,8 +220,7 @@ public class CommentTest extends TestCas
// first make sure we can delete an entry with comments
User user = TestUtils.setupUser("commentParentDeleteUser");
Weblog weblog = TestUtils.setupWeblog("commentParentDelete", user);
- WeblogEntry entry = TestUtils.setupWeblogEntry("CommentParentDeletes1",
- weblog.getDefaultCategory(), weblog, user);
+ WeblogEntry entry = TestUtils.setupWeblogEntry("CommentParentDeletes1", weblog, user);
TestUtils.endSession(true);
entry = TestUtils.getManagedWeblogEntry(entry);
@@ -243,8 +242,7 @@ public class CommentTest extends TestCas
// now make sure we can delete a weblog with comments
weblog = TestUtils.getManagedWebsite(weblog);
user = TestUtils.getManagedUser(user);
- entry = TestUtils.setupWeblogEntry("CommentParentDeletes2",
- weblog.getDefaultCategory(), weblog, user);
+ entry = TestUtils.setupWeblogEntry("CommentParentDeletes2", weblog, user);
TestUtils.endSession(true);
entry = TestUtils.getManagedWeblogEntry(entry);
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java Thu Jul 24 03:25:47 2014
@@ -102,7 +102,7 @@ public class IndexManagerTest extends Te
wd1.setPubTime(new Timestamp(System.currentTimeMillis()));
wd1.setWebsite(TestUtils.getManagedWebsite(testWeblog));
- WeblogCategory cat = wem.getWeblogCategory(testWeblog.getDefaultCategory().getId());
+ WeblogCategory cat = wem.getWeblogCategory(testWeblog.getWeblogCategory("General").getId());
wd1.setCategory(cat);
wem.saveWeblogEntry(wd1);
@@ -126,7 +126,7 @@ public class IndexManagerTest extends Te
wd2.setPubTime(new Timestamp(System.currentTimeMillis()));
wd2.setWebsite(TestUtils.getManagedWebsite(testWeblog));
- cat = wem.getWeblogCategory(testWeblog.getDefaultCategory().getId());
+ cat = wem.getWeblogCategory(testWeblog.getWeblogCategory("General").getId());
wd2.setCategory(cat);
wem.saveWeblogEntry(wd2);
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java Thu Jul 24 03:25:47 2014
@@ -75,7 +75,7 @@ public class PlanetManagerLocalTest exte
testEntry1.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry1.setWebsite(testWeblog);
testEntry1.setCreatorUserName(testUser.getUserName());
- testEntry1.setCategory(testWeblog.getDefaultCategory());
+ testEntry1.setCategory(testWeblog.getWeblogCategory("General"));
testEntry1.setStatus(PubStatus.PUBLISHED);
WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry1);
@@ -88,7 +88,7 @@ public class PlanetManagerLocalTest exte
testEntry2.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry2.setWebsite(testWeblog);
testEntry2.setCreatorUserName(testUser.getUserName());
- testEntry2.setCategory(testWeblog.getDefaultCategory());
+ testEntry2.setCategory(testWeblog.getWeblogCategory("General"));
testEntry2.setStatus(PubStatus.PUBLISHED);
WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry2);
@@ -101,7 +101,7 @@ public class PlanetManagerLocalTest exte
testEntry3.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry3.setWebsite(testWeblog);
testEntry3.setCreatorUserName(testUser.getUserName());
- testEntry3.setCategory(testWeblog.getDefaultCategory());
+ testEntry3.setCategory(testWeblog.getWeblogCategory("General"));
testEntry3.setStatus(PubStatus.PUBLISHED);
WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry3);
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java Thu Jul 24 03:25:47 2014
@@ -121,7 +121,7 @@ public class WeblogEntryTest extends Tes
testEntry.setWebsite(testWeblog);
testEntry.setCreatorUserName(testUser.getUserName());
- WeblogCategory cat = testWeblog.getDefaultCategory();
+ WeblogCategory cat = testWeblog.getWeblogCategory("General");
testEntry.setCategory(cat);
// create a weblog entry
@@ -167,11 +167,11 @@ public class WeblogEntryTest extends Tes
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
- WeblogEntry entry1 = TestUtils.setupWeblogEntry("entry1", testWeblog.getDefaultCategory(), testWeblog, testUser);
- WeblogEntry entry2 = TestUtils.setupWeblogEntry("entry2", testWeblog.getDefaultCategory(), testWeblog, testUser);
- WeblogEntry entry3 = TestUtils.setupWeblogEntry("entry3", testWeblog.getDefaultCategory(), testWeblog, testUser);
- WeblogEntry entry4 = TestUtils.setupWeblogEntry("entry4", testWeblog.getDefaultCategory(), testWeblog, testUser);
- WeblogEntry entry5 = TestUtils.setupWeblogEntry("entry5", testWeblog.getDefaultCategory(), testWeblog, testUser);
+ WeblogEntry entry1 = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser);
+ WeblogEntry entry2 = TestUtils.setupWeblogEntry("entry2", testWeblog, testUser);
+ WeblogEntry entry3 = TestUtils.setupWeblogEntry("entry3", testWeblog, testUser);
+ WeblogEntry entry4 = TestUtils.setupWeblogEntry("entry4", testWeblog, testUser);
+ WeblogEntry entry5 = TestUtils.setupWeblogEntry("entry5", testWeblog, testUser);
// make a couple changes
entry1.setLocale("en_US");
@@ -229,7 +229,7 @@ public class WeblogEntryTest extends Tes
// get all (non-future) PUBLISHED entries in category
WeblogEntrySearchCriteria wesc9 = new WeblogEntrySearchCriteria();
wesc9.setWeblog(testWeblog);
- wesc9.setCatName(testWeblog.getDefaultCategory().getName());
+ wesc9.setCatName("General");
wesc9.setStatus(PubStatus.PUBLISHED);
entries = mgr.getWeblogEntries(wesc9);
assertNotNull(entries);
@@ -264,7 +264,7 @@ public class WeblogEntryTest extends Tes
// get all entries in category
WeblogEntrySearchCriteria wesc5 = new WeblogEntrySearchCriteria();
wesc5.setWeblog(testWeblog);
- wesc5.setCatName(testWeblog.getDefaultCategory().getName());
+ wesc5.setCatName("General");
entries = mgr.getWeblogEntries(wesc5);
assertNotNull(entries);
assertEquals(5, entries.size());
@@ -373,7 +373,7 @@ public class WeblogEntryTest extends Tes
new java.sql.Timestamp(new java.util.Date().getTime()));
testEntry.setWebsite(testWeblog);
testEntry.setCreatorUserName(testUser.getUserName());
- testEntry.setCategory(testWeblog.getDefaultCategory());
+ testEntry.setCategory(testWeblog.getWeblogCategory("General"));
// shortcut
testEntry.addTag("testTag");
@@ -966,7 +966,7 @@ public class WeblogEntryTest extends Tes
testEntry.setWebsite(testWeblog);
testEntry.setCreatorUserName(testUser.getUserName());
- WeblogCategory cat = testWeblog.getDefaultCategory();
+ WeblogCategory cat = testWeblog.getWeblogCategory("General");
testEntry.setCategory(cat);
// create a weblog entry
@@ -1027,7 +1027,7 @@ public class WeblogEntryTest extends Tes
Weblog blog2 = TestUtils.setupWeblog("statblog2", user1);
Weblog blog3 = TestUtils.setupWeblog("statblog3", user1);
- blog3.setEnabled(Boolean. FALSE);
+ blog3.setVisible(Boolean.FALSE);
wmgr.saveWeblog(blog3);
WeblogEntry entry1 = TestUtils.setupWeblogEntry("entry1", blog1, user1);
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java Thu Jul 24 03:25:47 2014
@@ -38,16 +38,16 @@ public class WeblogStatsTest extends Tes
website1 = TestUtils.setupWeblog("a_testWebsite1", user1);
entry11 = TestUtils.setupWeblogEntry(
- "anchor11", website1.getDefaultCategory(), website1, user1);
+ "anchor11", website1, user1);
comment11 = TestUtils.setupComment("Comment11", entry11);
comment12 = TestUtils.setupComment("Comment12", entry11);
entry12 = TestUtils.setupWeblogEntry(
- "anchor12", website1.getDefaultCategory(), website1, user1);
+ "anchor12", website1, user1);
comment13 = TestUtils.setupComment("Comment13", entry12);
website2 = TestUtils.setupWeblog("b_testWebsite2", user1);
entry21 = TestUtils.setupWeblogEntry(
- "anchor21", website2.getDefaultCategory(), website2, user1);
+ "anchor21", website2, user1);
comment21 = TestUtils.setupComment("Comment21", entry21);
TestUtils.endSession(true);
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java Thu Jul 24 03:25:47 2014
@@ -102,12 +102,11 @@ public class WeblogTest extends TestCase
Weblog testWeblog = new Weblog();
testUser = TestUtils.getManagedUser(testUser);
testWeblog.setName("Test Weblog");
- testWeblog.setDescription("Test Weblog");
+ testWeblog.setTagline("Test Weblog");
testWeblog.setHandle("testweblog");
testWeblog.setEmailAddress("testweblog@dev.null");
testWeblog.setEditorPage("editor-text.jsp");
testWeblog.setBlacklist("");
- testWeblog.setEmailFromAddress("");
testWeblog.setEditorTheme("basic");
testWeblog.setLocale("en_US");
testWeblog.setTimeZone("America/Los_Angeles");
@@ -186,17 +185,17 @@ public class WeblogTest extends TestCase
assertNotNull(weblog);
assertEquals(testWeblog1.getHandle(), weblog.getHandle());
- // make sure disable weblogs are not returned
- weblog.setEnabled(Boolean.FALSE);
+ // make sure disabled weblogs are not returned
+ weblog.setVisible(Boolean.FALSE);
mgr.saveWeblog(weblog);
TestUtils.endSession(true);
weblog = null;
weblog = mgr.getWeblogByHandle(testWeblog1.getHandle());
assertNull(weblog);
- // restore enabled state
+ // restore visible state
weblog = mgr.getWeblogByHandle(testWeblog1.getHandle(), Boolean.FALSE);
- weblog.setEnabled(Boolean.TRUE);
+ weblog.setVisible(Boolean.TRUE);
mgr.saveWeblog(weblog);
TestUtils.endSession(true);
weblog = null;
@@ -211,7 +210,7 @@ public class WeblogTest extends TestCase
assertNotNull(weblog);
// make sure disabled weblogs are not returned
- weblog.setEnabled(Boolean.FALSE);
+ weblog.setVisible(Boolean.FALSE);
mgr.saveWeblog(weblog);
TestUtils.endSession(true);
List weblogs2 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true);
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java?rev=1612987&r1=1612986&r2=1612987&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java Thu Jul 24 03:25:47 2014
@@ -53,7 +53,7 @@ public class CommentValidatorTest extend
weblog = TestUtils.setupWeblog("doeblog", user);
//TestUtils.endSession(true)
- entry = TestUtils.setupWeblogEntry("anchor1", weblog.getDefaultCategory(), weblog, user);
+ entry = TestUtils.setupWeblogEntry("anchor1", weblog, user);
TestUtils.endSession(true);
}