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 19:07:24 UTC
svn commit: r1613190 - in /roller/trunk/app/src:
main/java/org/apache/roller/weblogger/business/
main/java/org/apache/roller/weblogger/business/jpa/
main/java/org/apache/roller/weblogger/business/plugins/entry/
main/java/org/apache/roller/weblogger/bus...
Author: gmazza
Date: Thu Jul 24 17:07:23 2014
New Revision: 1613190
URL: http://svn.apache.org/r1613190
Log:
Changed code terminology from 'page' to 'template' and (in many cases) 'website' to 'weblog'
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.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/plugins/entry/AcronymsPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.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/business/themes/WeblogSharedTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.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/ThemeEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java Thu Jul 24 17:07:23 2014
@@ -31,7 +31,7 @@ import org.apache.roller.weblogger.pojos
/**
- * Interface to weblog and page template management.
+ * Interface to weblog and weblog custom template management.
*/
public interface WeblogManager {
@@ -143,56 +143,56 @@ public interface WeblogManager {
throws WebloggerException;
/**
- * Store page.
+ * Store a custom weblog template.
*/
- void savePage(WeblogTemplate data) throws WebloggerException;
+ void saveTemplate(WeblogTemplate data) throws WebloggerException;
/**
- * Remove page.
+ * Remove a custom template.
*/
- void removePage(WeblogTemplate page) throws WebloggerException;
+ void removeTemplate(WeblogTemplate template) throws WebloggerException;
/**
- * Get page by id.
+ * Get a custom template by its id.
*/
- WeblogTemplate getPage(String id) throws WebloggerException;
+ WeblogTemplate getTemplate(String id) throws WebloggerException;
/**
- * Get user's page by action.
+ * Get a custom template by the action it supports.
*/
- WeblogTemplate getPageByAction(Weblog w, String a) throws WebloggerException;
+ WeblogTemplate getTemplateByAction(Weblog w, String a) throws WebloggerException;
/**
- * Get user's page by name.
+ * Get a custom template by its name.
*/
- WeblogTemplate getPageByName(Weblog w, String p) throws WebloggerException;
+ WeblogTemplate getTemplateByName(Weblog w, String p) throws WebloggerException;
/**
- * Get website's page by link.
+ * Get a custom template by its link.
*/
- WeblogTemplate getPageByLink(Weblog w, String p)
+ WeblogTemplate getTemplateByLink(Weblog w, String p)
throws WebloggerException;
/**
- * Get template code by Type.
+ * Get a custom template rendition by parent template ID and rendition type.
*/
- CustomTemplateRendition getTemplateRenditionByType(String templateName, RenditionType type)
+ CustomTemplateRendition getTemplateRenditionByType(String templateId, RenditionType type)
throws WebloggerException ;
/**
- * Save template code
+ * Save a custom template rendition
*/
void saveTemplateRendition(CustomTemplateRendition templateCode) throws WebloggerException;
/**
- * Get website's pages
+ * Get all custom templates for a weblog
*/
- List<WeblogTemplate> getPages(Weblog w) throws WebloggerException;
+ List<WeblogTemplate> getTemplates(Weblog w) throws WebloggerException;
/**
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=1613190&r1=1613189&r2=1613190&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 17:07:23 2014
@@ -88,18 +88,18 @@ public class JPAWeblogManagerImpl implem
/**
- * Update existing website.
+ * Update existing weblog.
*/
- public void saveWeblog(Weblog website) throws WebloggerException {
+ public void saveWeblog(Weblog weblog) throws WebloggerException {
- website.setLastModified(new java.util.Date());
- strategy.store(website);
+ weblog.setLastModified(new java.util.Date());
+ strategy.store(weblog);
}
public void removeWeblog(Weblog weblog) throws WebloggerException {
- // remove contents first, then remove website
- this.removeWebsiteContents(weblog);
+ // remove contents first, then remove weblog
+ this.removeWeblogContents(weblog);
this.strategy.remove(weblog);
// remove entry from cache mapping
@@ -110,7 +110,7 @@ public class JPAWeblogManagerImpl implem
* convenience method for removing contents of a weblog.
* TODO BACKEND: use manager methods instead of queries here
*/
- private void removeWebsiteContents(Weblog website)
+ private void removeWeblogContents(Weblog weblog)
throws WebloggerException {
UserManager umgr = roller.getUserManager();
@@ -119,7 +119,7 @@ public class JPAWeblogManagerImpl implem
// remove tags
TypedQuery<WeblogEntryTag> tagQuery = strategy.getNamedQuery("WeblogEntryTag.getByWeblog",
WeblogEntryTag.class);
- tagQuery.setParameter(1, website);
+ tagQuery.setParameter(1, weblog);
List<WeblogEntryTag> results = tagQuery.getResultList();
for (WeblogEntryTag tagData : results) {
@@ -130,13 +130,13 @@ public class JPAWeblogManagerImpl implem
}
// remove site tag aggregates
- List<TagStat> tags = emgr.getTags(website, null, null, 0, -1);
+ List<TagStat> tags = emgr.getTags(weblog, null, null, 0, -1);
updateTagAggregates(tags);
// delete all weblog tag aggregates
Query removeAggs= strategy.getNamedUpdate(
"WeblogEntryTagAggregate.removeByWeblog");
- removeAggs.setParameter(1, website);
+ removeAggs.setParameter(1, weblog);
removeAggs.executeUpdate();
// delete all bad counts
@@ -145,37 +145,37 @@ public class JPAWeblogManagerImpl implem
removeCounts.setParameter(1, 0);
removeCounts.executeUpdate();
- // Remove the website's ping queue entries
+ // Remove the weblog's ping queue entries
TypedQuery<PingQueueEntry> q = strategy.getNamedQuery("PingQueueEntry.getByWebsite", PingQueueEntry.class);
- q.setParameter(1, website);
+ q.setParameter(1, weblog);
List queueEntries = q.getResultList();
for (Object obj : queueEntries) {
this.strategy.remove(obj);
}
- // Remove the website's auto ping configurations
+ // Remove the weblog's auto ping configurations
AutoPingManager autoPingMgr = roller.getAutopingManager();
- List<AutoPing> autopings = autoPingMgr.getAutoPingsByWebsite(website);
+ List<AutoPing> autopings = autoPingMgr.getAutoPingsByWebsite(weblog);
for (AutoPing autoPing : autopings) {
this.strategy.remove(autoPing);
}
- // remove associated pages
- TypedQuery<WeblogTemplate> pageQuery = strategy.getNamedQuery("WeblogTemplate.getByWebsite",
+ // remove associated templates
+ TypedQuery<WeblogTemplate> templateQuery = strategy.getNamedQuery("WeblogTemplate.getByWeblog",
WeblogTemplate.class);
- pageQuery.setParameter(1, website);
- List<WeblogTemplate> pages = pageQuery.getResultList();
+ templateQuery.setParameter(1, weblog);
+ List<WeblogTemplate> templates = templateQuery.getResultList();
- for (WeblogTemplate page : pages) {
+ for (WeblogTemplate template : templates) {
// remove associated templateCode objects
- this.removeTemplateCodeObjs(page);
- this.strategy.remove(page);
+ this.removeTemplateRenditions(template);
+ this.strategy.remove(template);
}
// remove folders (including bookmarks)
TypedQuery<WeblogBookmarkFolder> folderQuery = strategy.getNamedQuery("WeblogBookmarkFolder.getByWebsite",
WeblogBookmarkFolder.class);
- folderQuery.setParameter(1, website);
+ folderQuery.setParameter(1, weblog);
List<WeblogBookmarkFolder> folders = folderQuery.getResultList();
for (WeblogBookmarkFolder wbf : folders) {
this.strategy.remove(wbf);
@@ -184,8 +184,8 @@ public class JPAWeblogManagerImpl implem
// remove mediafile metadata
// remove uploaded files
MediaFileManager mfmgr = WebloggerFactory.getWeblogger().getMediaFileManager();
- mfmgr.removeAllFiles(website);
- //List<MediaFileDirectory> dirs = mmgr.getMediaFileDirectories(website);
+ mfmgr.removeAllFiles(weblog);
+ //List<MediaFileDirectory> dirs = mmgr.getMediaFileDirectories(weblog);
//for (MediaFileDirectory dir : dirs) {
//this.strategy.remove(dir);
//}
@@ -193,7 +193,7 @@ public class JPAWeblogManagerImpl implem
// remove entries
TypedQuery<WeblogEntry> refQuery = strategy.getNamedQuery("WeblogEntry.getByWebsite", WeblogEntry.class);
- refQuery.setParameter(1, website);
+ refQuery.setParameter(1, weblog);
List<WeblogEntry> entries = refQuery.getResultList();
for (WeblogEntry entry : entries) {
emgr.removeWeblogEntry(entry);
@@ -202,11 +202,11 @@ public class JPAWeblogManagerImpl implem
// delete all weblog categories
Query removeCategories= strategy.getNamedUpdate("WeblogCategory.removeByWeblog");
- removeCategories.setParameter(1, website);
+ removeCategories.setParameter(1, weblog);
removeCategories.executeUpdate();
// remove permissions
- for (WeblogPermission perm : umgr.getWeblogPermissions(website)) {
+ for (WeblogPermission perm : umgr.getWeblogPermissions(weblog)) {
umgr.revokeWeblogPermission(perm.getWeblog(), perm.getUser(), WeblogPermission.ALL_ACTIONS);
}
@@ -230,27 +230,27 @@ public class JPAWeblogManagerImpl implem
}
/**
- * @see org.apache.roller.weblogger.business.WeblogManager#savePage(WeblogTemplate)
+ * @see org.apache.roller.weblogger.business.WeblogManager#saveTemplate(WeblogTemplate)
*/
- public void savePage(WeblogTemplate page) throws WebloggerException {
- this.strategy.store(page);
+ public void saveTemplate(WeblogTemplate template) throws WebloggerException {
+ this.strategy.store(template);
- // update weblog last modified date. date updated by saveWebsite()
- roller.getWeblogManager().saveWeblog(page.getWebsite());
+ // update weblog last modified date. date updated by saveWeblog()
+ roller.getWeblogManager().saveWeblog(template.getWeblog());
}
public void saveTemplateRendition(CustomTemplateRendition rendition) throws WebloggerException {
this.strategy.store(rendition);
- // update of the template should happen by saving template page.
+ // template update should happen by saving rendition.
}
- public void removePage(WeblogTemplate page) throws WebloggerException {
+ public void removeTemplate(WeblogTemplate template) throws WebloggerException {
//remove template code objects
- this.removeTemplateCodeObjs(page);
+ this.removeTemplateRenditions(template);
- this.strategy.remove(page);
- // update weblog last modified date. date updated by saveWebsite()
- roller.getWeblogManager().saveWeblog(page.getWebsite());
+ this.strategy.remove(template);
+ // update weblog last modified date. date updated by saveWeblog()
+ roller.getWeblogManager().saveWeblog(template.getWeblog());
}
public void addWeblog(Weblog newWeblog) throws WebloggerException {
@@ -346,7 +346,7 @@ public class JPAWeblogManagerImpl implem
}
/**
- * Return website specified by handle.
+ * Return weblog specified by handle.
*/
public Weblog getWeblogByHandle(String handle, Boolean visible)
throws WebloggerException {
@@ -374,29 +374,29 @@ public class JPAWeblogManagerImpl implem
TypedQuery<Weblog> query = strategy.getNamedQuery("Weblog.getByHandle", Weblog.class);
query.setParameter(1, handle);
- Weblog website;
+ Weblog weblog;
try {
- website = query.getSingleResult();
+ weblog = query.getSingleResult();
} catch (NoResultException e) {
- website = null;
+ weblog = null;
}
// add mapping to cache
- if(website != null) {
+ if(weblog != null) {
log.debug("weblogHandleToId CACHE MISS - "+handle);
- this.weblogHandleToIdMap.put(website.getHandle(), website.getId());
+ this.weblogHandleToIdMap.put(weblog.getHandle(), weblog.getId());
}
- if(website != null &&
- (visible == null || visible.equals(website.getVisible()))) {
- return website;
+ if(weblog != null &&
+ (visible == null || visible.equals(weblog.getVisible()))) {
+ return weblog;
} else {
return null;
}
}
/**
- * Get websites of a user
+ * Get weblogs of a user
*/
public List<Weblog> getWeblogs(
Boolean enabled, Boolean active,
@@ -489,7 +489,7 @@ public class JPAWeblogManagerImpl implem
return users;
}
- public WeblogTemplate getPage(String id) throws WebloggerException {
+ public WeblogTemplate getTemplate(String id) throws WebloggerException {
// Don't hit database for templates stored on disk
if (id != null && id.endsWith(".vm")) {
return null;
@@ -501,21 +501,21 @@ public class JPAWeblogManagerImpl implem
/**
* Use JPA directly because Weblogger's Query API does too much allocation.
*/
- public WeblogTemplate getPageByLink(Weblog website, String pagelink)
+ public WeblogTemplate getTemplateByLink(Weblog weblog, String templateLink)
throws WebloggerException {
- if (website == null) {
+ if (weblog == null) {
throw new WebloggerException("userName is null");
}
- if (pagelink == null) {
- throw new WebloggerException("Pagelink is null");
+ if (templateLink == null) {
+ throw new WebloggerException("templateLink is null");
}
- TypedQuery<WeblogTemplate> query = strategy.getNamedQuery("WeblogTemplate.getByWebsite&Link",
+ TypedQuery<WeblogTemplate> query = strategy.getNamedQuery("WeblogTemplate.getByWeblog&Link",
WeblogTemplate.class);
- query.setParameter(1, website);
- query.setParameter(2, pagelink);
+ query.setParameter(1, weblog);
+ query.setParameter(2, templateLink);
try {
return query.getSingleResult();
} catch (NoResultException e) {
@@ -524,13 +524,13 @@ public class JPAWeblogManagerImpl implem
}
/**
- * @see org.apache.roller.weblogger.business.WeblogManager#getPageByAction(Weblog, String)
+ * @see org.apache.roller.weblogger.business.WeblogManager#getTemplateByAction(Weblog, String)
*/
- public WeblogTemplate getPageByAction(Weblog website, String action)
+ public WeblogTemplate getTemplateByAction(Weblog weblog, String action)
throws WebloggerException {
- if (website == null) {
- throw new WebloggerException("website is null");
+ if (weblog == null) {
+ throw new WebloggerException("weblog is null");
}
if (action == null) {
@@ -539,7 +539,7 @@ public class JPAWeblogManagerImpl implem
TypedQuery<WeblogTemplate> query = strategy.getNamedQuery("WeblogTemplate.getByAction",
WeblogTemplate.class);
- query.setParameter(1, website);
+ query.setParameter(1, weblog);
query.setParameter(2, action);
try {
return query.getSingleResult();
@@ -549,23 +549,23 @@ public class JPAWeblogManagerImpl implem
}
/**
- * @see org.apache.roller.weblogger.business.WeblogManager#getPageByName(Weblog, java.lang.String)
+ * @see org.apache.roller.weblogger.business.WeblogManager#getTemplateByName(Weblog, java.lang.String)
*/
- public WeblogTemplate getPageByName(Weblog website, String pagename)
+ public WeblogTemplate getTemplateByName(Weblog weblog, String templateName)
throws WebloggerException {
- if (website == null) {
- throw new WebloggerException("website is null");
+ if (weblog == null) {
+ throw new WebloggerException("weblog is null");
}
- if (pagename == null) {
- throw new WebloggerException("Page name is null");
+ if (templateName == null) {
+ throw new WebloggerException("Template name is null");
}
- TypedQuery<WeblogTemplate> query = strategy.getNamedQuery("WeblogTemplate.getByWebsite&Name",
+ TypedQuery<WeblogTemplate> query = strategy.getNamedQuery("WeblogTemplate.getByWeblog&Name",
WeblogTemplate.class);
- query.setParameter(1, website);
- query.setParameter(2, pagename);
+ query.setParameter(1, weblog);
+ query.setParameter(2, templateName);
try {
return query.getSingleResult();
} catch (NoResultException e) {
@@ -575,7 +575,7 @@ public class JPAWeblogManagerImpl implem
public CustomTemplateRendition getTemplateRenditionByType(String templateId, RenditionType type) throws WebloggerException{
if(templateId == null) {
- throw new WebloggerException("Template Name is null");
+ throw new WebloggerException("Template ID is null");
}
if (type == null) {
@@ -594,15 +594,15 @@ public class JPAWeblogManagerImpl implem
}
/**
- * @see org.apache.roller.weblogger.business.WeblogManager#getPages(Weblog)
+ * @see org.apache.roller.weblogger.business.WeblogManager#getTemplates(Weblog)
*/
- public List<WeblogTemplate> getPages(Weblog website) throws WebloggerException {
- if (website == null) {
- throw new WebloggerException("website is null");
+ public List<WeblogTemplate> getTemplates(Weblog weblog) throws WebloggerException {
+ if (weblog == null) {
+ throw new WebloggerException("weblog is null");
}
TypedQuery<WeblogTemplate> q = strategy.getNamedQuery(
- "WeblogTemplate.getByWebsiteOrderByName", WeblogTemplate.class);
- q.setParameter(1, website);
+ "WeblogTemplate.getByWeblogOrderByName", WeblogTemplate.class);
+ q.setParameter(1, weblog);
return q.getResultList();
}
@@ -671,9 +671,9 @@ public class JPAWeblogManagerImpl implem
for (Object obj : queryResults) {
Object[] row = (Object[]) obj;
StatCount sc = new StatCount(
- (String)row[1], // website id
- (String)row[2], // website handle
- (String)row[3], // website name
+ (String)row[1], // weblog id
+ (String)row[2], // weblog handle
+ (String)row[3], // weblog name
"statCount.weblogCommentCountType", // stat type
((Long)row[0])); // # comments
sc.setWeblogHandle((String)row[2]);
@@ -697,10 +697,10 @@ public class JPAWeblogManagerImpl implem
return results.get(0);
}
- private void removeTemplateCodeObjs(WeblogTemplate page) throws WebloggerException {
+ private void removeTemplateRenditions(WeblogTemplate template) throws WebloggerException {
TypedQuery<CustomTemplateRendition> codeQuery = strategy.getNamedQuery(
"CustomTemplateRendition.getRenditionsByTemplateId", CustomTemplateRendition.class);
- codeQuery.setParameter(1, page.getId());
+ codeQuery.setParameter(1, template.getId());
List<CustomTemplateRendition> codeList = codeQuery.getResultList();
for (CustomTemplateRendition code : codeList) {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java Thu Jul 24 17:07:23 2014
@@ -126,7 +126,7 @@ public class AcronymsPlugin implements W
Properties acronyms = new Properties();
try {
WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
- WeblogTemplate acronymsPage = wmgr.getPageByName(
+ WeblogTemplate acronymsPage = wmgr.getTemplateByName(
website, "_acronyms");
if (acronymsPage != null) {
CustomTemplateRendition ctr = acronymsPage.getTemplateRendition(TemplateRendition.RenditionType.STANDARD);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Thu Jul 24 17:07:23 2014
@@ -189,18 +189,18 @@ public class ThemeManagerImpl implements
* @see org.apache.roller.weblogger.business.themes.ThemeManager#importTheme(Weblog,
* SharedTheme)
*/
- public void importTheme(Weblog website, SharedTheme theme)
+ public void importTheme(Weblog weblog, SharedTheme theme)
throws WebloggerException {
log.debug("Importing theme [" + theme.getName() + "] to weblog ["
- + website.getName() + "]");
+ + weblog.getName() + "]");
WeblogManager wmgr = roller.getWeblogManager();
MediaFileManager fileMgr = roller.getMediaFileManager();
- MediaFileDirectory root = fileMgr.getDefaultMediaFileDirectory(website);
+ MediaFileDirectory root = fileMgr.getDefaultMediaFileDirectory(weblog);
if (root == null) {
- log.warn("Weblog " + website.getHandle()
+ log.warn("Weblog " + weblog.getHandle()
+ " does not have a root MediaFile directory");
}
@@ -214,19 +214,19 @@ public class ThemeManagerImpl implements
&& !themeTemplate.getAction().equals(
WeblogTemplate.ACTION_CUSTOM)) {
importedActionTemplates.add(themeTemplate.getAction());
- template = wmgr.getPageByAction(website,
+ template = wmgr.getTemplateByAction(weblog,
themeTemplate.getAction());
// otherwise, lookup by name
} else {
- template = wmgr.getPageByName(website, themeTemplate.getName());
+ template = wmgr.getTemplateByName(weblog, themeTemplate.getName());
}
// Weblog does not have this template, so create it.
boolean newTmpl = false;
if (template == null) {
template = new WeblogTemplate();
- template.setWebsite(website);
+ template.setWeblog(weblog);
newTmpl = true;
}
@@ -248,7 +248,7 @@ public class ThemeManagerImpl implements
template.setLastModified(new Date());
// save it
- wmgr.savePage(template);
+ wmgr.saveTemplate(template);
}
// create weblog template code objects and save them
@@ -283,21 +283,21 @@ public class ThemeManagerImpl implements
for (String action : WeblogTemplate.ACTIONS) {
// if we didn't import this action then see if it should be deleted
if (!importedActionTemplates.contains(action)) {
- WeblogTemplate toDelete = wmgr.getPageByAction(website, action);
+ WeblogTemplate toDelete = wmgr.getTemplateByAction(weblog, action);
if (toDelete != null) {
log.debug("Removing stale action template "
+ toDelete.getId());
- wmgr.removePage(toDelete);
+ wmgr.removeTemplate(toDelete);
}
}
}
// always update this weblog's theme and customStylesheet, then save
- website.setEditorTheme(WeblogTheme.CUSTOM);
+ weblog.setEditorTheme(WeblogTheme.CUSTOM);
if (theme.getStylesheet() != null) {
- website.setCustomStylesheetPath(theme.getStylesheet().getLink());
+ weblog.setCustomStylesheetPath(theme.getStylesheet().getLink());
}
- wmgr.saveWeblog(website);
+ wmgr.saveWeblog(weblog);
// now lets import all the theme resources
for (ThemeResource resource : theme.getResources()) {
@@ -306,10 +306,10 @@ public class ThemeManagerImpl implements
if (resource.isDirectory()) {
MediaFileDirectory mdir = fileMgr.getMediaFileDirectoryByName(
- website, resource.getPath());
+ weblog, resource.getPath());
if (mdir == null) {
log.debug(" Creating directory: " + resource.getPath());
- fileMgr.createMediaFileDirectory(website, resource.getPath());
+ fileMgr.createMediaFileDirectory(weblog, resource.getPath());
roller.flush();
} else {
log.debug(" No action: directory already exists");
@@ -323,7 +323,7 @@ public class ThemeManagerImpl implements
String justPath;
if (resourcePath.indexOf('/') == -1) {
- mdir = fileMgr.getDefaultMediaFileDirectory(website);
+ mdir = fileMgr.getDefaultMediaFileDirectory(weblog);
justPath = "";
justName = resourcePath;
@@ -335,27 +335,27 @@ public class ThemeManagerImpl implements
}
justName = resourcePath.substring(resourcePath
.lastIndexOf('/') + 1);
- mdir = fileMgr.getMediaFileDirectoryByName(website,
+ mdir = fileMgr.getMediaFileDirectoryByName(weblog,
justPath);
if (mdir == null) {
log.debug(" Creating directory: " + justPath);
- mdir = fileMgr.createMediaFileDirectory(website,
+ mdir = fileMgr.createMediaFileDirectory(weblog,
justPath);
roller.flush();
}
}
- MediaFile oldmf = fileMgr.getMediaFileByOriginalPath(website,
+ MediaFile oldmf = fileMgr.getMediaFileByOriginalPath(weblog,
justPath + "/" + justName);
if (oldmf != null) {
- fileMgr.removeMediaFile(website, oldmf);
+ fileMgr.removeMediaFile(weblog, oldmf);
}
// save file without file-type, quota checks, etc.
InputStream is = resource.getInputStream();
MediaFile mf = new MediaFile();
mf.setDirectory(mdir);
- mf.setWeblog(website);
+ mf.setWeblog(weblog);
mf.setName(justName);
mf.setOriginalPath(justPath + "/" + justName);
mf.setContentType(map.getContentType(justName));
@@ -365,7 +365,7 @@ public class ThemeManagerImpl implements
log.debug(" Saving file: " + justName);
log.debug(" Saviving in directory = " + mf.getDirectory());
RollerMessages errors = new RollerMessages();
- fileMgr.createMediaFile(website, mf, errors);
+ fileMgr.createMediaFile(weblog, mf, errors);
try {
resource.getInputStream().close();
} catch (IOException ex) {
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=1613190&r1=1613189&r2=1613190&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 17:07:23 2014
@@ -77,7 +77,7 @@ public class WeblogCustomTheme extends W
* Get the collection of all templates associated with this Theme.
*/
public List<? extends ThemeTemplate> getTemplates() throws WebloggerException {
- return WebloggerFactory.getWeblogger().getWeblogManager().getPages(this.weblog);
+ return WebloggerFactory.getWeblogger().getWeblogManager().getTemplates(this.weblog);
}
@@ -96,7 +96,7 @@ public class WeblogCustomTheme extends W
*/
public ThemeTemplate getDefaultTemplate() throws WebloggerException {
return WebloggerFactory.getWeblogger().getWeblogManager()
- .getPageByAction(this.weblog, ThemeTemplate.ACTION_WEBLOG);
+ .getTemplateByAction(this.weblog, ThemeTemplate.ACTION_WEBLOG);
}
@@ -108,7 +108,7 @@ public class WeblogCustomTheme extends W
if (action == null) {
return null;
}
- return WebloggerFactory.getWeblogger().getWeblogManager().getPageByAction(this.weblog, action);
+ return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateByAction(this.weblog, action);
}
@@ -120,7 +120,7 @@ public class WeblogCustomTheme extends W
if (name == null) {
return null;
}
- return WebloggerFactory.getWeblogger().getWeblogManager().getPageByName(this.weblog, name);
+ return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateByName(this.weblog, name);
}
@@ -133,7 +133,7 @@ public class WeblogCustomTheme extends W
return null;
}
- return WebloggerFactory.getWeblogger().getWeblogManager().getPageByLink(this.weblog, link);
+ return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateByLink(this.weblog, link);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java Thu Jul 24 17:07:23 2014
@@ -81,7 +81,7 @@ public class WeblogSharedTheme extends W
// first get the pages from the db
try {
- for (ThemeTemplate template : WebloggerFactory.getWeblogger().getWeblogManager().getPages(this.weblog)) {
+ for (ThemeTemplate template : WebloggerFactory.getWeblogger().getWeblogManager().getTemplates(this.weblog)) {
pages.put(template.getName(), template);
}
} catch(Exception e) {
@@ -120,7 +120,7 @@ public class WeblogSharedTheme extends W
if(stylesheet != null) {
// now try getting custom version from weblog
ThemeTemplate override = WebloggerFactory.getWeblogger()
- .getWeblogManager().getPageByLink(this.weblog, stylesheet.getLink());
+ .getWeblogManager().getTemplateByLink(this.weblog, stylesheet.getLink());
if(override != null) {
stylesheet = override;
}
@@ -179,7 +179,7 @@ public class WeblogSharedTheme extends W
// if we didn't get the Template from a theme then look in the db
if (template == null) {
- template = WebloggerFactory.getWeblogger().getWeblogManager().getPageByName(this.weblog, name);
+ template = WebloggerFactory.getWeblogger().getWeblogManager().getTemplateByName(this.weblog, name);
}
return template;
@@ -211,7 +211,7 @@ public class WeblogSharedTheme extends W
// if we didn't get the Template from a theme then look in the db
if(template == null) {
template = WebloggerFactory.getWeblogger()
- .getWeblogManager().getPageByLink(this.weblog, link);
+ .getWeblogManager().getTemplateByLink(this.weblog, link);
}
return template;
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java Thu Jul 24 17:07:23 2014
@@ -72,11 +72,11 @@ public class WeblogTemplate implements T
this.id = id;
}
- public Weblog getWebsite() {
+ public Weblog getWeblog() {
return this.weblog;
}
- public void setWebsite( Weblog website ) {
+ public void setWeblog( Weblog website ) {
this.weblog = website;
}
@@ -194,14 +194,14 @@ public class WeblogTemplate implements T
WeblogTemplate o = (WeblogTemplate)other;
return new EqualsBuilder()
.append(getName(), o.getName())
- .append(getWebsite(), o.getWebsite())
+ .append(getWeblog(), o.getWeblog())
.isEquals();
}
public int hashCode() {
return new HashCodeBuilder()
.append(getName())
- .append(getWebsite())
+ .append(getWeblog())
.toHashCode();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java Thu Jul 24 17:07:23 2014
@@ -405,8 +405,8 @@ public final class SiteWideCache impleme
* A weblog template has changed.
*/
public void invalidate(WeblogTemplate template) {
- if(WebloggerRuntimeConfig.isSiteWideWeblog(template.getWebsite().getHandle())) {
- invalidate(template.getWebsite());
+ if(WebloggerRuntimeConfig.isSiteWideWeblog(template.getWeblog().getHandle())) {
+ invalidate(template.getWeblog());
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java Thu Jul 24 17:07:23 2014
@@ -81,7 +81,7 @@ public class RollerResourceLoader extend
try {
WeblogTemplate page = WebloggerFactory.getWeblogger()
- .getWeblogManager().getPage(name);
+ .getWeblogManager().getTemplate(name);
if (page == null) {
throw new ResourceNotFoundException(
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java Thu Jul 24 17:07:23 2014
@@ -85,14 +85,14 @@ public class StylesheetEdit extends UIAc
log.debug("custom stylesheet path is - " + stylesheet.getLink());
try {
setTemplate(WebloggerFactory.getWeblogger().getWeblogManager()
- .getPageByLink(getActionWeblog(), stylesheet.getLink()));
+ .getTemplateByLink(getActionWeblog(), stylesheet.getLink()));
if (getTemplate() == null) {
log.debug("custom stylesheet not found, creating it");
// template doesn't exist yet, so create it
WeblogTemplate stylesheetTmpl = new WeblogTemplate();
- stylesheetTmpl.setWebsite(getActionWeblog());
+ stylesheetTmpl.setWeblog(getActionWeblog());
stylesheetTmpl.setAction(ThemeTemplate.ACTION_CUSTOM);
stylesheetTmpl.setName(stylesheet.getName());
stylesheetTmpl.setDescription(stylesheet.getDescription());
@@ -124,7 +124,7 @@ public class StylesheetEdit extends UIAc
}
WebloggerFactory.getWeblogger().getWeblogManager()
- .savePage(stylesheetTmpl);
+ .saveTemplate(stylesheetTmpl);
setTemplate(stylesheetTmpl);
WebloggerFactory.getWeblogger().flush();
@@ -141,7 +141,7 @@ public class StylesheetEdit extends UIAc
ThemeTemplate override = WebloggerFactory
.getWeblogger()
.getWeblogManager()
- .getPageByLink(
+ .getTemplateByLink(
getActionWeblog(),
getActionWeblog().getTheme()
.getStylesheet().getLink());
@@ -235,7 +235,7 @@ public class StylesheetEdit extends UIAc
}
// save template and flush
- WebloggerFactory.getWeblogger().getWeblogManager().savePage(stylesheet);
+ WebloggerFactory.getWeblogger().getWeblogManager().saveTemplate(stylesheet);
WebloggerFactory.getWeblogger().flush();
@@ -305,7 +305,7 @@ public class StylesheetEdit extends UIAc
// save template and flush
WebloggerFactory.getWeblogger().getWeblogManager()
- .savePage(stylesheet);
+ .saveTemplate(stylesheet);
WebloggerFactory.getWeblogger().flush();
// notify caches
@@ -353,7 +353,7 @@ public class StylesheetEdit extends UIAc
.getWeblogManager();
// Remove template and page codes
- mgr.removePage(stylesheet);
+ mgr.removeTemplate(stylesheet);
Weblog weblog = getActionWeblog();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Thu Jul 24 17:07:23 2014
@@ -64,7 +64,7 @@ public class TemplateEdit extends UIActi
public void myPrepare() {
try {
- setTemplate(WebloggerFactory.getWeblogger().getWeblogManager().getPage(getBean().getId()));
+ setTemplate(WebloggerFactory.getWeblogger().getWeblogManager().getTemplate(getBean().getId()));
} catch (WebloggerException ex) {
log.error("Error looking up template - " + getBean().getId(), ex);
}
@@ -130,7 +130,7 @@ public class TemplateEdit extends UIActi
}
// save template
- WebloggerFactory.getWeblogger().getWeblogManager().savePage(templateToSave);
+ WebloggerFactory.getWeblogger().getWeblogManager().saveTemplate(templateToSave);
log.debug("Saved template: " + templateToSave.getId());
//flush
@@ -158,7 +158,7 @@ public class TemplateEdit extends UIActi
if (!getTemplate().getName().equals(getBean().getName())) {
try {
if (WebloggerFactory.getWeblogger().getWeblogManager()
- .getPageByName(getActionWeblog(), getBean().getName()) != null) {
+ .getTemplateByName(getActionWeblog(), getBean().getName()) != null) {
addError("pagesForm.error.alreadyExists", getBean().getName());
}
} catch (WebloggerException ex) {
@@ -171,7 +171,7 @@ public class TemplateEdit extends UIActi
!getBean().getLink().equals(getTemplate().getLink())) {
try {
if (WebloggerFactory.getWeblogger().getWeblogManager()
- .getPageByLink(getActionWeblog(), getBean().getLink()) != null) {
+ .getTemplateByLink(getActionWeblog(), getBean().getLink()) != null) {
addError("pagesForm.error.alreadyExists", getBean().getLink());
}
} catch (WebloggerException ex) {
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=1613190&r1=1613189&r2=1613190&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 17:07:23 2014
@@ -62,7 +62,7 @@ public class TemplateRemove extends UIAc
if (getRemoveId() != null) {
try {
setTemplate(WebloggerFactory.getWeblogger().getWeblogManager()
- .getPage(getRemoveId()));
+ .getTemplate(getRemoveId()));
} catch (WebloggerException ex) {
log.error("Error looking up template by id - " + getRemoveId(),
ex);
@@ -108,11 +108,11 @@ public class TemplateRemove extends UIAc
getActionWeblog().getTheme()
.getStylesheet().getLink())) {
// Same so OK to delete
- WeblogTemplate css = mgr.getPageByLink(
+ WeblogTemplate css = mgr.getTemplateByLink(
getActionWeblog(), stylesheet.getLink());
if (css != null) {
- mgr.removePage(css);
+ mgr.removeTemplate(css);
}
}
@@ -123,7 +123,7 @@ public class TemplateRemove extends UIAc
// notify cache
CacheManager.invalidate(getTemplate());
- mgr.removePage(getTemplate());
+ mgr.removeTemplate(getTemplate());
WebloggerFactory.getWeblogger().flush();
return SUCCESS;
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=1613190&r1=1613189&r2=1613190&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 17:07:23 2014
@@ -72,7 +72,7 @@ public class Templates extends UIAction
// get current list of templates, minus custom stylesheet
List<WeblogTemplate> raw = WebloggerFactory.getWeblogger()
- .getWeblogManager().getPages(getActionWeblog());
+ .getWeblogManager().getTemplates(getActionWeblog());
List<WeblogTemplate> pages = new ArrayList<WeblogTemplate>();
pages.addAll(raw);
// Remove style sheet from list so not to show when theme is
@@ -81,7 +81,7 @@ public class Templates extends UIAction
pages.remove(WebloggerFactory
.getWeblogger()
.getWeblogManager()
- .getPageByLink(
+ .getTemplateByLink(
getActionWeblog(),
getActionWeblog().getTheme().getStylesheet()
.getLink()));
@@ -144,7 +144,7 @@ public class Templates extends UIAction
try {
WeblogTemplate newTemplate = new WeblogTemplate();
- newTemplate.setWebsite(getActionWeblog());
+ newTemplate.setWeblog(getActionWeblog());
newTemplate.setAction(getNewTmplAction());
newTemplate.setName(getNewTmplName());
newTemplate.setDescription(newTemplate.getName());
@@ -164,7 +164,7 @@ public class Templates extends UIAction
// save the new Template
WebloggerFactory.getWeblogger().getWeblogManager()
- .savePage(newTemplate);
+ .saveTemplate(newTemplate);
// Create weblog template codes for available types.
CustomTemplateRendition standardRendition = new CustomTemplateRendition(
@@ -227,7 +227,7 @@ public class Templates extends UIAction
try {
WeblogTemplate existingPage = WebloggerFactory.getWeblogger()
.getWeblogManager()
- .getPageByName(getActionWeblog(), getNewTmplName());
+ .getTemplateByName(getActionWeblog(), getNewTmplName());
if (existingPage != null) {
addError("pagesForm.error.alreadyExists", getNewTmplName());
}
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=1613190&r1=1613189&r2=1613190&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 17:07:23 2014
@@ -80,7 +80,7 @@ public class TemplatesRemove extends UIA
for (String id : idsToDelete) {
if (!id.equals("")) {
- template = mgr.getPage(id);
+ template = mgr.getTemplate(id);
if (template != null) {
pages.add(template);
}
@@ -139,7 +139,7 @@ public class TemplatesRemove extends UIA
for (String id : idsToDelete) {
if (!id.equals("")) {
- template = mgr.getPage(id);
+ template = mgr.getTemplate(id);
if (!template.isRequired()
|| !WeblogTemplate.ACTION_CUSTOM
.equals(getActionWeblog()
@@ -163,12 +163,12 @@ public class TemplatesRemove extends UIA
.getStylesheet()
.getLink())) {
// Same so OK to delete
- WeblogTemplate css = mgr.getPageByLink(
+ WeblogTemplate css = mgr.getTemplateByLink(
getActionWeblog(),
stylesheet.getLink());
if (css != null) {
- mgr.removePage(css);
+ mgr.removeTemplate(css);
}
}
@@ -176,7 +176,7 @@ public class TemplatesRemove extends UIA
weblog.setCustomStylesheetPath(null);
}
- mgr.removePage(template);
+ mgr.removeTemplate(template);
}
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java Thu Jul 24 17:07:23 2014
@@ -101,7 +101,7 @@ public class ThemeEdit extends UIAction
ThemeTemplate override = WebloggerFactory
.getWeblogger()
.getWeblogManager()
- .getPageByLink(
+ .getTemplateByLink(
getActionWeblog(),
getActionWeblog().getTheme().getStylesheet()
.getLink());
@@ -230,13 +230,13 @@ public class ThemeEdit extends UIAction
&& !originalTheme.equals(getThemeId())
&& getActionWeblog().getTheme().getStylesheet() != null) {
- WeblogTemplate stylesheet = mgr.getPageByLink(
+ WeblogTemplate stylesheet = mgr.getTemplateByLink(
getActionWeblog(), getActionWeblog().getTheme()
.getStylesheet().getLink());
if (stylesheet != null) {
// Remove template and page codes
- mgr.removePage(stylesheet);
+ mgr.removeTemplate(stylesheet);
// Reset
weblog.setCustomStylesheetPath(null);
}
@@ -287,7 +287,7 @@ public class ThemeEdit extends UIAction
return (WebloggerFactory
.getWeblogger()
.getWeblogManager()
- .getPageByAction(getActionWeblog(),
+ .getTemplateByAction(getActionWeblog(),
WeblogTemplate.ACTION_WEBLOG) == null);
} catch (WebloggerException ex) {
log.error("Error looking up weblog template", ex);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Thu Jul 24 17:07:23 2014
@@ -146,12 +146,12 @@ public class BloggerAPIHandler extends B
}
try {
- WeblogTemplate page = WebloggerFactory.getWeblogger().getWeblogManager().getPage(templateType);
- CustomTemplateRendition ctr = page.getTemplateRendition(RenditionType.STANDARD);
+ WeblogTemplate template = WebloggerFactory.getWeblogger().getWeblogManager().getTemplate(templateType);
+ CustomTemplateRendition ctr = template.getTemplateRendition(RenditionType.STANDARD);
if (ctr != null) {
ctr.setTemplate(templateData);
WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateRendition(ctr);
- flushPageCache(page.getWebsite());
+ flushPageCache(template.getWeblog());
return true;
} else {
mLogger.error("Cannot find standard rendering for template.");
@@ -190,9 +190,9 @@ public class BloggerAPIHandler extends B
try {
CustomTemplateRendition ctr = null;
- WeblogTemplate page = WebloggerFactory.getWeblogger().getWeblogManager().getPage(templateType);
- if (page != null) {
- ctr = page.getTemplateRendition(RenditionType.STANDARD);
+ WeblogTemplate template = WebloggerFactory.getWeblogger().getWeblogManager().getTemplate(templateType);
+ if (template != null) {
+ ctr = template.getTemplateRendition(RenditionType.STANDARD);
}
if (null == ctr) {
throw new XmlRpcException(UNKNOWN_EXCEPTION,"Standard rendering of template not found");
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml Thu Jul 24 17:07:23 2014
@@ -7,20 +7,20 @@
<entity metadata-complete="true" name="WeblogTemplate"
class="org.apache.roller.weblogger.pojos.WeblogTemplate" access="PROPERTY">
<table name="weblog_custom_template"/>
- <named-query name="WeblogTemplate.getByWebsite">
- <query>SELECT w FROM WeblogTemplate w WHERE w.website = ?1</query>
+ <named-query name="WeblogTemplate.getByWeblog">
+ <query>SELECT w FROM WeblogTemplate w WHERE w.weblog = ?1</query>
</named-query>
- <named-query name="WeblogTemplate.getByWebsiteOrderByName">
- <query>SELECT w FROM WeblogTemplate w WHERE w.website = ?1 ORDER BY w.name</query>
+ <named-query name="WeblogTemplate.getByWeblogOrderByName">
+ <query>SELECT w FROM WeblogTemplate w WHERE w.weblog = ?1 ORDER BY w.name</query>
</named-query>
- <named-query name="WeblogTemplate.getByWebsite&Link">
- <query>SELECT w FROM WeblogTemplate w WHERE w.website = ?1 AND w.link = ?2</query>
+ <named-query name="WeblogTemplate.getByWeblog&Link">
+ <query>SELECT w FROM WeblogTemplate w WHERE w.weblog = ?1 AND w.link = ?2</query>
</named-query>
<named-query name="WeblogTemplate.getByAction">
- <query>SELECT w FROM WeblogTemplate w WHERE w.website = ?1 AND w.action = ?2</query>
+ <query>SELECT w FROM WeblogTemplate w WHERE w.weblog = ?1 AND w.action = ?2</query>
</named-query>
- <named-query name="WeblogTemplate.getByWebsite&Name">
- <query>SELECT w FROM WeblogTemplate w WHERE w.website = ?1 AND w.name= ?2</query>
+ <named-query name="WeblogTemplate.getByWeblog&Name">
+ <query>SELECT w FROM WeblogTemplate w WHERE w.weblog = ?1 AND w.name= ?2</query>
</named-query>
<attributes>
@@ -52,7 +52,7 @@
<basic name="outputContentType">
<column name="outputtype" insertable="true" updatable="true" unique="false"/>
</basic>
- <many-to-one name="website" target-entity="org.apache.roller.weblogger.pojos.Weblog">
+ <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>
<transient name="custom"/>
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java Thu Jul 24 17:07:23 2014
@@ -75,7 +75,7 @@ public class CustomTemplateRenditionTest
testPage.setDescription("Test Weblog Template");
testPage.setLink("testTemp");
testPage.setLastModified(new java.util.Date());
- testPage.setWebsite(TestUtils.getManagedWebsite(testWeblog));
+ testPage.setWeblog(TestUtils.getManagedWebsite(testWeblog));
}
public void tearDown() throws Exception {
@@ -102,7 +102,7 @@ public class CustomTemplateRenditionTest
// create template
- mgr.savePage(testPage);
+ mgr.saveTemplate(testPage);
//create standard template coce
@@ -150,8 +150,8 @@ public class CustomTemplateRenditionTest
mobileCode = mgr.getTemplateRenditionByType(testPage.getId(), RenditionType.MOBILE);
assertEquals("update.mobile.template",mobileCode.getTemplate());
- WeblogTemplate page = mgr.getPage(testPage.getId());
- mgr.removePage(page);
+ WeblogTemplate page = mgr.getTemplate(testPage.getId());
+ mgr.removeTemplate(page);
TestUtils.endSession(true);
// check that update was successful
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java?rev=1613190&r1=1613189&r2=1613190&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java Thu Jul 24 17:07:23 2014
@@ -75,7 +75,7 @@ public class WeblogPageTest extends Test
testPage.setDescription("Test Weblog Template");
testPage.setLink("testTemp");
testPage.setLastModified(new java.util.Date());
- testPage.setWebsite(TestUtils.getManagedWebsite(testWeblog));
+ testPage.setWeblog(TestUtils.getManagedWebsite(testWeblog));
}
public void tearDown() throws Exception {
@@ -99,37 +99,34 @@ public class WeblogPageTest extends Test
public void testTemplateCRUD() throws Exception {
WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
- WeblogTemplate template = null;
+ WeblogTemplate template;
// create template
- mgr.savePage(testPage);
+ mgr.saveTemplate(testPage);
TestUtils.endSession(true);
// check that create was successful
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- template = null;
- template = mgr.getPageByName(testWeblog, testPage.getName());
+ template = mgr.getTemplateByName(testWeblog, testPage.getName());
assertNotNull(template);
// update template
template.setName("testtesttest");
- mgr.savePage(template);
+ mgr.saveTemplate(template);
TestUtils.endSession(true);
// check that update was successful
- template = null;
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- template = mgr.getPageByName(testWeblog, "testtesttest");
+ template = mgr.getTemplateByName(testWeblog, "testtesttest");
assertNotNull(template);
// delete template
- mgr.removePage(template);
+ mgr.removeTemplate(template);
TestUtils.endSession(true);
// check that delete was successful
- template = null;
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- template = mgr.getPageByName(testWeblog, testPage.getName());
+ template = mgr.getTemplateByName(testWeblog, testPage.getName());
assertNull(template);
}
@@ -140,40 +137,37 @@ public class WeblogPageTest extends Test
public void testPermissionsLookups() throws Exception {
WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
- WeblogTemplate page = null;
+ WeblogTemplate page;
// create page
- mgr.savePage(testPage);
+ mgr.saveTemplate(testPage);
String id = testPage.getId();
TestUtils.endSession(true);
// lookup by id
- page = mgr.getPage(id);
+ page = mgr.getTemplate(id);
assertNotNull(page);
// lookup by action
- page = null;
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- page = mgr.getPageByAction(testWeblog, testPage.getAction());
+ page = mgr.getTemplateByAction(testWeblog, testPage.getAction());
assertNotNull(page);
// lookup by name
- page = null;
- page = mgr.getPageByName(testWeblog, testPage.getName());
+ page = mgr.getTemplateByName(testWeblog, testPage.getName());
assertNotNull(page);
// lookup by link
- page = null;
- page = mgr.getPageByLink(testWeblog, testPage.getLink());
+ page = mgr.getTemplateByLink(testWeblog, testPage.getLink());
assertNotNull(page);
// lookup all pages for weblog
- List pages = mgr.getPages(testWeblog);
+ List pages = mgr.getTemplates(testWeblog);
assertNotNull(pages);
assertEquals(1, pages.size());
// delete page
- mgr.removePage(page);
+ mgr.removeTemplate(page);
TestUtils.endSession(true);
}