Author: gmazza
Date: Thu Jul 24 22:22:57 2014
New Revision: 1613314
URL: http://svn.apache.org/r1613314
Log:
Removal of customstylesheet column from weblog table. Tested that it works
during 5.0.x -> 5.1 upgrade.
Modified:
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/Weblog.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/TemplateRemove.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/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -295,11 +295,8 @@ public class ThemeManagerImpl implements
}
}
- // always update this weblog's theme and customStylesheet, then
save
+ // set weblog's theme to custom, then save
weblog.setEditorTheme(WeblogTheme.CUSTOM);
- if (theme.getStylesheet() != null) {
-
weblog.setCustomStylesheetPath(theme.getStylesheet().getLink());
- }
wmgr.saveWeblog(weblog);
// now lets import all the theme resources
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -87,7 +87,7 @@ public class WeblogCustomTheme extends W
* Returns null if no stylesheet can be found.
*/
public ThemeTemplate getStylesheet() throws WebloggerException {
- return getTemplateByLink(this.weblog.getCustomStylesheetPath());
+ return getTemplateByAction(ComponentType.STYLESHEET);
}
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -118,15 +118,14 @@ public class WeblogSharedTheme extends W
// load from theme first to see if we even support a stylesheet
ThemeTemplate stylesheet = this.theme.getStylesheet();
- if(stylesheet != null) {
+ if (stylesheet != null) {
// now try getting custom version from weblog
ThemeTemplate override = WebloggerFactory.getWeblogger()
- .getWeblogManager().getTemplateByLink(this.weblog,
stylesheet.getLink());
- if(override != null) {
+ .getWeblogManager().getTemplateByAction(this.weblog,
ComponentType.STYLESHEET);
+ if (override != null) {
stylesheet = override;
}
}
-
return stylesheet;
}
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -79,7 +79,6 @@ public class Weblog implements Serializa
private Date lastModified = new Date();
private boolean enableMultiLang = false;
private boolean showAllLangs = true;
- private String customStylesheetPath = null;
private String iconPath = null;
private String about = null;
private String creator = null;
@@ -532,17 +531,6 @@ public class Weblog implements Serializa
}
/**
- * The path under the weblog's resources to a stylesheet override.
- */
- public String getCustomStylesheetPath() {
- return customStylesheetPath;
- }
-
- public void setCustomStylesheetPath(String customStylesheetPath) {
- this.customStylesheetPath = customStylesheetPath;
- }
-
- /**
* The path under the weblog's resources to an icon image.
*/
public String getIconPath() {
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -359,9 +359,6 @@ public class StylesheetEdit extends UIAc
Weblog weblog = getActionWeblog();
- // Clear for next custom theme
- weblog.setCustomStylesheetPath(null);
-
// save updated weblog and flush
mgr.saveWeblog(weblog);
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -115,10 +115,6 @@ public class TemplateRemove extends UIAc
mgr.removeTemplate(css);
}
}
-
- // Clear for next custom theme
- weblog.setCustomStylesheetPath(null);
-
}
// notify cache
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -169,10 +169,6 @@ public class TemplatesRemove extends UIA
mgr.removeTemplate(css);
}
}
-
- // Clear for next custom theme
- weblog.setCustomStylesheetPath(null);
-
}
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -147,12 +147,6 @@ public class ThemeEdit extends UIAction
if (isImportTheme()
&& !StringUtils.isEmpty(getImportThemeId())) {
themeMgr.importTheme(getActionWeblog(), t);
- } else {
- // Reset our custom from base
- if (t.getStylesheet() != null) {
- weblog.setCustomStylesheetPath(t.getStylesheet()
- .getLink());
- }
}
} catch (Exception re) {
log.error("Error customizing theme for weblog - "
@@ -236,10 +230,8 @@ public class ThemeEdit extends UIAction
.getStylesheet().getLink());
if (stylesheet != null) {
- // Remove template and page codes
+ // Remove template and its renditions
mgr.removeTemplate(stylesheet);
- // Reset
- weblog.setCustomStylesheetPath(null);
}
}
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=1613314&r1=1613313&r2=1613314&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 22:22:57 2014
@@ -103,9 +103,6 @@
<basic name="showAllLangs">
<column name="showalllangs" insertable="true"
updatable="true" unique="false"/>
</basic>
- <basic name="customStylesheetPath">
- <column name="customstylesheet"
insertable="true" updatable="true" unique="false"/>
- </basic>
<many-to-one name="bloggerCategory"
target-entity="org.apache.roller.weblogger.pojos.WeblogCategory">
<join-column name="bloggercatid"
insertable="true" updatable="true"/>
</many-to-one>
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=1613314&r1=1613313&r2=1613314&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
22:22:57 2014
@@ -34,12 +34,15 @@ create table custom_template_rendition (
#renameTable('webpage' 'weblog_custom_template')
-#capitalizing column constants as these are now stored as enums in Java.
+-- capitalizing column constants as these are now stored as enums in Java.
update weblog_custom_template set templatelang = upper(templatelang);
update weblog_custom_template wct set action = upper(action);
-#The main stylesheet for a theme has a new action, STYLESHEET.
+
+-- The main stylesheet for a theme has a new action, STYLESHEET.
update weblog_custom_template wct set action='STYLESHEET' where link is not
null and link = (select customstylesheet from weblog w where w.id =
wct.websiteid);
+#dropColumn('weblog' 'customstylesheet')
+
update weblog set editorpage = 'editor-xinha.jsp' where editorpage =
'editor-rte.jsp';
insert into custom_template_rendition(id, templateid, template, templatelang,
type)
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=1613314&r1=1613313&r2=1613314&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Thu Jul 24 22:22:57 2014
@@ -104,7 +104,6 @@ create table weblog (
lastmodified $db.TIMESTAMP_SQL_TYPE,
enablemultilang $db.BOOLEAN_SQL_TYPE_FALSE not null,
showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null,
- customstylesheet varchar(128),
about varchar(255),
icon varchar(255),
analyticscode $db.TEXT_SQL_TYPE
